NavigationBar: Custom height (2/2)

Ported from http://review.cyanogenmod.org/#/c/23610/

Conflicts:
	res/values-de/strings.xml
	res/xml/system_settings.xml
	src/com/android/settings/cyanogenmod/SystemSettings.java

Change-Id: Id5d9adba6853e29c089bad1f0de4edb49c017edf
finnq: I've just added more values and cleaned up the code a little bit.

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	src/com/android/settings/cyanogenmod/SystemSettings.java
RC: Battery Bar + colorpicker

Port of https://github.com/AOKP/packages_apps_ROMControl/commit/4d23fe17046512f5d9841bd79cb1bc83480e73b0

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	src/com/android/settings/cyanogenmod/StatusBar.java

Change-Id: If3377e2836e4f37fcb7d71a5d4f8d5f8a6f857dd
Re-arrange and group CM system settings

Change-Id: Ic42e92ebcf6ddb1903b57733be314c857167a469

Conflicts:
	res/values/strings.xml
	res/xml/system_settings.xml
Settings: Add fast charge QS toggle and other

this commit add
- qs toggle
- interactive reacting with pw toggle
- option stays after reboot
- option is hidden if kernel doesn't support
- code cleanup

Change-Id: I089667e2de01f50032d09e3e9c6eee07dd665c7d

Conflicts:
	res/values/strings.xml
	src/com/android/settings/cyanogenmod/QuickSettings.java
	src/com/android/settings/cyanogenmod/QuickSettingsUtil.java
Custom Carrier Label by BeerGang

https://github.com/BeerGang/android_packages_apps_Settings/commit/7efebbc66d7a8585c329c73a5dc2412f8745a156

Change-Id: I3510d45f182e6868c5f598a46502c47f8ab4376a
modified:   res/values/strings.xml
modified:   res/xml/display_settings.xml
modified:   src/com/android/settings/DisplaySettings.java

Conflicts:
	res/values/strings.xml
fix derp

Change-Id: I7c24a760270046a9c660d5b54ca81b8b921f5539
Advanced reboot enabled by default (2/2)

Change-Id: I2697d3f570d1411ab2b0826e2f31b59db65b2498
Remove warning on performance settings

Change-Id: I44bad84682868859231b8d12a7d265f95733b53f
Port Dualpanel for Settings from Beergang

Change-Id: I3c07fd9081c549ed3b01f11f0fefa8c0fad7b43c

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

Conflicts:
	res/values/strings.xml
cleanup / fix NPE

Change-Id: I5d4242ca55a30ee692319b174fc2739300cd06cb
Clock stuff from here, changed for us a95645e04e1f968347dca11e7a0f131cba079f9d

Conflicts:
	AndroidManifest.xml
	src/com/android/settings/cyanogenmod/StatusBar.java

Change-Id: Ia31dcf8b83053f4449cd990c443a5073bf41cd89

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	src/com/android/settings/cyanogenmod/StatusBar.java
Remove eight spaces *rolleyes*

Change-Id: I26588d077e1be1bd7d65f5447924030502badf17
Fix Settings

Change-Id: I9776777e1321ffac40a737e158f68793482b3c16
NavigationBar: Custom height (2/2)

Ported from http://review.cyanogenmod.org/#/c/23610/

Conflicts:
	res/values-de/strings.xml
	res/xml/system_settings.xml
	src/com/android/settings/cyanogenmod/SystemSettings.java

Change-Id: Id5d9adba6853e29c089bad1f0de4edb49c017edf
finnq: I've just added more values and cleaned up the code a little bit.

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	src/com/android/settings/cyanogenmod/SystemSettings.java
Clean up navigation bar height

Change-Id: Ib2bce41e946a6c4d4c5cd4c0783b999347eebf5c

Conflicts:
	res/values/arrays.xml
	res/xml/system_settings.xml
	src/com/android/settings/cyanogenmod/SystemSettings.java
RC: Battery Bar + colorpicker

Port of https://github.com/AOKP/packages_apps_ROMControl/commit/4d23fe17046512f5d9841bd79cb1bc83480e73b0

Conflicts:
	res/values-de/strings.xml
	res/values/arrays.xml
	res/values/strings.xml
	src/com/android/settings/cyanogenmod/StatusBar.java

Change-Id: I28f48ab23fd34c39642340e56b71e51577e46afb
Clean up navigation bar height

Change-Id: Ib2bce41e946a6c4d4c5cd4c0783b999347eebf5c

Conflicts:
	res/values/arrays.xml
	res/xml/system_settings.xml
	src/com/android/settings/cyanogenmod/SystemSettings.java
31062 - Added option to always pull down quick settings

Change-Id: Ie8a4cfe361d42d91d4c699daf522d79548130285
merge changes from remotes/github/cm-10.1 into master
Option to use volume keys to control media volume anytime (1/2)

Some users don't adjust ringtone volume often (e.g. only use toggle to
switch between silent and non-silent) mode. Having an option to
use the volume keys to control media volume anytime allows media
volume to be controllled/muted before entering a game or other apps
with sound in an undesirable location.

Change-Id: I6dbd25d1a14bcf5b1bf0b0468b96f4b4f8efdb14