Settings : Add preference for proximity wake

Change-Id: I2fcbdee3bcf33f8e44b6c5fa29fb1d4d6dcab8e4
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>
[1/2] Add option to disable smart cover window screen

Mostly for those with a smart cover without a window

Change-Id: Ifd4b2d8359acd63deb41107524d1a532eaab150b
Signed-off-by: willl03 <wgangers@gmail.com>
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>
Make smart cover options opt in.

Thanks to Kit and Griffin for the help

Change-Id: Id8ec763f926a076cbed423cc6614246ae2caf74c
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>
Settings Cleanup and Reorganization

Change-Id: I9bd56cfb2689985c2c94273e2058c10c89d21858
Merge remote-tracking branch 'slim/kk4.4-caf' into w03-caf

Conflicts:
	res/values/slim_strings.xml
	res/xml/display_settings.xml
	res/xml/notification_drawer_settings.xml
	res/xml/security_settings_app_slim.xml
	res/xml/security_settings_biometric_weak.xml
	res/xml/security_settings_chooser.xml
	res/xml/security_settings_lockscreen.xml
	res/xml/security_settings_password.xml
	res/xml/security_settings_pattern.xml
	res/xml/security_settings_pin.xml
	res/xml/slim_interface_settings.xml
	src/com/android/settings/DisplaySettings.java
	src/com/android/settings/SecuritySettings.java
Get rid of that settings reorganization merge