Settings : Fix CustomScreenColor when picking an image

Change-Id: I510b562eb0e9fb9b558380db5c5d6e818ba17d12
Cleanup lockscreen security settings

Since we moved lockscreen security settings to a separate fragment,
these changes we have initially made are not longer needed

Change-Id: Iac07850e974e9ea423fd8908ce1e134a9a2508ef

Conflicts:
	res/xml/lockscreen_interface_settings.xml
	src/com/android/settings/LockscreenSecuritySettings.java
	src/com/android/settings/SecuritySettings.java
Remove 'More device settings' menu

Change-Id: I86cd84f6f6c408b26c04d92529e9a031c4fed1f7

Conflicts:
	res/values/cm_strings.xml
	res/xml/sound_settings.xml
	src/com/android/settings/DisplaySettings.java
	src/com/android/settings/Settings.java
	src/com/android/settings/SoundSettings.java
Settings: Fix lockscreen security strings

Change-Id: I9e35108cc7a0d65c80cc87ad9502c9ffdc29847a
Settings: Remove V+ pref if V+ isn't present

Change-Id: Ia202d00ebee95e99018e7b04ef284de0bf3f1e1c

Conflicts:
	src/com/android/settings/WirelessSettings.java
Settings: Fix Notification Drawer icons.

Change-Id: I5fe6fcf23a97f7449aa964d5cf796018dd11abb5

Conflicts:
	res/drawable-hdpi/ic_notify_open_normal.png
	res/drawable-mdpi/ic_notify_open_normal.png
	res/drawable-xhdpi/ic_notify_open_normal.png
	res/drawable-xxhdpi/ic_notify_open_normal.png
DevelopmentSettings: Add an opt-out for recovery updater

* Some devices should not have this option. For instance devices
  that require a loki'd image. Flashing a non-loki'd image could
  cause the device not to boot and be a real headache for users.

* Set ro.disable.recovery.updater=1 in build.prop (or init) to
  hide this menu option.

Change-Id: I1963e27e59353e1a7e26a4edf905bee6c9da0571
Settings: Add HeadsUp setting.

Change-Id: Ib7a59145843bedb16aacc87bf6d3c6da143e8d3e

Conflicts:
	res/values/cm_strings.xml
	res/xml/heads_up_settings.xml
	res/xml/notification_drawer.xml
Hide heads up settings and show a notice if heads up is disabled.

This follows a UI pattern used at several other places, such as
daydream, screencast, profiles or blacklist settings.

Change-Id: I5635338ceccae8ba8450284d3078889333fb77c6

Conflicts:
	res/values/cm_strings.xml
DisplaySettings: Add hardware-framework support for color enhancement

Change-Id: I9fa4e7409266ce9e658c93ae32940050cfe437d2

Conflicts:
	src/com/android/settings/DisplaySettings.java
Settings: Remove unnecessary padding from HeadsUpSettings.

Change-Id: I823aa97f32049dc6c6baf6c859c47219952fe454