Revert "Settings: Heads Up background color && transparency [1/2]"

This reverts commit 5757e5f5ba720a5653ed2c7c1219e922a2053508.
Revert "Move heads up to its own preferencescreen"

This reverts commit 23344cc78aa44af8e608dd1a5e359c2789d04cfb.
Settings: Heads Up background color && transparency [1/2]

PS12: squash dependency - heads up settings now under interface menu

PS: add ability to set custom heads up text color

Change-Id: I606bf35d5db9a253448971bdedf6fdb3acad6452
Settings : Add preference for proximity wake

Change-Id: I2fcbdee3bcf33f8e44b6c5fa29fb1d4d6dcab8e4

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>

Conflicts:
	src/com/android/settings/DisplaySettings.java
[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>