Settings: less notification sounds (2/2)

Change-Id: Icd035c06e5955880c73687e5b1407d54b96e1271

Conflicts:
	res/values/slim_arrays.xml
	res/values/slim_strings.xml
	res/xml/slim_sound_settings.xml
	src/com/android/settings/slim/SoundSettings.java

Conflicts:
	res/values/spirit_strings.xml
Add more steps to less notification sounds

Change-Id: Ia1c4bd41680d291458bf3453a51788579236fd6d
Always show navbar toggle

Change-Id: I9ae9929be29ded6c9e615003bbe0b2a33cc1665e
[1/2] Settings: Clock on lockscreen

Allow to enable status bar clock on lockscreen (default off)

Change-Id: Id5c579e30aeb2cb2edd0fa8617458508c7aab06f

Conflicts:
	res/values/custom_strings.xml
	src/com/android/settings/spirit/StatusBarClockStyle.java
Heads up master switch (2/2)

Add an short explanation abaout how to enable Heads Up per app for those who don't like to read or serch in changelogs

Change-Id: I2f00ad71e564bc15c3904d295cfdccc4a4673996

Conflicts:
	res/values/cr_strings.xml
	res/xml/heads_up_settings.xml

Conflicts:
	res/values/cr_strings.xml
	src/com/android/settings/spirit/HeadsUpSettings.java
Add more explanation in case of disable heads up through master switch

- Call ui and mms will stop receive heads up notifications automatically

Change-Id: Ie800b84e203d59cb922b82815f538cc28ec1c8e6

Conflicts:
	res/values/cr_strings.xml
Settings: "Vibrate during call" requires VOICE_CAPABLE

No need to have this option available if you are on a wifi-only
device.

Change-Id: I30e91be73b5dd058c35ca4f5316563fa63d30d1c
cmhw: Use hardware's default value for color enhancement

 * First boot should use the value read from sysfs rather than
   forcing the feature to be enabled.

Change-Id: Ibed5d8f3dc3644f972caf07853ca921c963dacfa