Fix
Revert "ProximityWake : Add support for checking proximity when waking device [2/2]"

This reverts commit 20b619a0d173707c988e050f88221b5fe1a7b798.

Conflicts:
	res/values/crom_strings.xml
	res/xml/display_settings.xml
Add hardware tunables (gamma, color, vibration strength).

Change-Id: I44e3e4e6cb444498a7c56048618cd92a0e2b8e59

Conflicts:
	proguard.flags
	res/values/crom_arrays.xml
	res/values/crom_strings.xml
	res/xml/settings_headers.xml
	src/com/android/settings/hardware/DisplayColor.java
Option to enable Notification Light when screen is on [2/2]

This makes itp ossible to enable the Notification LED even when the screen is on

Change-Id: I3f5b8f2136a833a4c651887f3c8c97d27246863e

Conflicts:
	res/values/kang_strings.xml
	res/xml/notification_light_settings.xml
Fix: Option to enable Notification Light when screen is on [2/2]

Change-Id: I8e9c1af52ba9168945cecf1f9b723051b5d15844

Conflicts:
	res/xml/notification_light_settings.xml
ScreenOnNotificationLed: Add "only when in fullscreen mode" option [2/2]

Change-Id: Ic797fbaa1ab298659f611f8a1b3ab64da2fd1e67

Conflicts:
	res/values/kang_arrays.xml
	res/values/kang_strings.xml
	res/xml/notification_light_settings.xml