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>
Settings Cleanup and Reorganization

Change-Id: I9bd56cfb2689985c2c94273e2058c10c89d21858
Revert "Lockscreen Notifications [2/2]"

This reverts commit cc131fe48b9b2d61bd3ba5bd49d953ac6d94acd8.

Conflicts:
	res/values-it/slim_strings.xml
	res/values/slim_strings.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
	src/com/android/settings/SecuritySettings.java

Change-Id: I370986da7e78a43d5b5c8a39b6da917f7d71b253
Merge branch 'kk4.4' of git://github.com/reS28raM/packages_apps_Settings into kk4.4

Conflicts:
	res/values-it/slim_strings.xml
	res/values/slim_strings.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
	src/com/android/settings/SecuritySettings.java

Change-Id: Ica91fefe679502a3c063e820ff3490fd7de1061e