Revert "Membar in display settings"

This reverts commit c7c80202152e8ae3e6331e14d405a6e4a234eab9.

Conflicts:
	res/values/vanir_strings.xml
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java
[2/2] Settings: Doze (ambient display) timeout

Patchset: put the preference in more sensible location.

Patchset: remove preference for devices that don't support
        doze display state.

Patchset: turn off doze timeout slider if doze is disabled

Patchset: move doze options to own preference category

Change-Id: I366a3a00bb48c20fa2d37f0b22fdbfeb3d004533

Conflicts:
	res/values/du_strings.xml
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java

Conflicts:
	res/xml/display_settings.xml
Settings: Add screen color settings

Add "Screen Color" item in settings.
This function support set Hue, Saturation, Contrast and Intensity value,
and screen color will be changed by this settings.

Change-Id: If6f6e7ee7f28862476a8b955cd3252175fefa2a1

Settings : Fix CustomScreenColor when picking an image

Change-Id: I510b562eb0e9fb9b558380db5c5d6e818ba17d12

Settings: Start service as explicit intent

Needed for API level 21. Add some ressource bits, set text color to
white.

Change-Id: I9c4a9139be69fa5c6d6c74055b5475f0d930c93a

Conflicts:
	src/com/android/settings/DisplaySettings.java

Conflicts:
	src/com/android/settings/DisplaySettings.java