Settings : Add preference for proximity wake

Change-Id: I2fcbdee3bcf33f8e44b6c5fa29fb1d4d6dcab8e4

Conflicts:
	res/values/slim_strings.xml

Conflicts:
	res/values/slim_strings.xml
Proximity Wake-Up : adjust strings

Change-Id: I605a11b5bd7150b2a456d5c355af49fd7047e173
Settings : Make proximity opt-in

  * Fix up code to compile

Change-Id: Idfa64758a3c6d60ca4801f6f7f34f0429f95cbec
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>
Revert "Single pane for 10" Settings"

This reverts commit 56f51a8927f53bee81145fe29e63af8a87e6fd1b.

Change-Id: If5c7be247caeeb4ec3e0bceed86bc5763d74f927
Dual panel for settings (2/2)

Change-Id: I3898acce280b8cb6386589affababcf3817cf12c
Update for Dual panel

Change-Id: Ib4b889bd63b495fe2e75daa35bae92f1d0264ef1
Swap volume buttons when the screen is rotated (2/2)

Change-Id: Ib2ab67e364cc4dfc9421e7130310cde899c3cfd6
Force Expanded Notifications (2/2)

Change-Id: I5f6790c976101dc34d0ed658837e24fa4a7d30aa
Settings: Reduce volume to safe level when headset is connected (1/2)

Change-Id: I7b3e41c0a0dc54e061303e99b25a50e3ce9a8e83
Derp

Change-Id: I1ac24c0963962ef7fc3666fd87c2dbf4dd0a1103
Settings: Add Utility function

Change-Id: Ic5316765d3db48351a9feaa9b3cce286d256071e
Update for volume key orientation

Change-Id: Ife926d10b4607faba26941579dc3b1d80a5455cf
Update for last few commits

Change-Id: Ic8509fb0c54d4bbf23c2c4195885352619f3f216
Over scroll effects [2/2]

Change-Id: Iac5bad384c377ddbbec333da121f2c47b0a7c9aa