Settings: QuickRecord Tile (2/2)

PS2: Forgot to set image name.

Change-Id: Ib20d4c7231f147674ed3afd4c438bd83aedbac1d

Conflicts:

	res/values/cm_strings.xml
	src/com/android/settings/quicksettings/QuickSettingsUtil.java
Revert "Settings: add never sleep screen mode (2/2)"

This reverts commit 3f123b6798c08eb658fc5ba8849ed34f90f12d95.
Add Music Tile (2/2)

Author: kufikugel

Change-Id: I6b3e9432600a41ad6b6183a9a621d07e4552c687
Screen Timeout Tile allow infinity [2/2]

Change-Id: If8e68ba8d73d8913063036e7c3cd512693a6fa6c

Signed-off-by: STELIX <ssspinni@gmail.com>

Conflicts:

	res/values/spirit_arrays.xml
[1/2] Settings: HALO

Forward port from jb43.

PS1 : Initial port
PS2 : Fix conflicts with notification LED
PS3 : FIx derp in strings
PS4 : Fix derp in pa_arrays (tag not closed)
PS5 : HALO Mods
PS6 : Update pa_arrays & pa_strings
PS7 : derp: rmv pesky file backups
PS8 : rebased
      Clean some white spaces
      removed some settings
PS9 : Rebase
PS10: Remove unused resources
PS12: Rebase

Change-Id: I1049bde2f6c1d86a0d2536eebc56575ec5f77513
Add Option to HALO On / Off

Credits : Der-Schubi

Conflicts:

	res/values/strings_crom.xml

Change-Id: I6795242b91a82cb80fa6a498e8ca3cc37435f2e5
HALO Tweaks (2/2)

Picked from CarbonRom

AICP:
Added utils from CarbonROM
Added Carbon's (Aicp)SettingsPreferenceFragment
Modified for AICP source and settings

PS2: Added Notification number text color option
PS3: Added Notification number bubble color option
PS4: Remove SystemUI restart call

Change-Id: Iaa171e50791bfa53f6bc2648f8303938a389c59e

Conflicts:

	res/values/crom_strings.xml
	src/com/android/settings/util/AbstractAsyncSuCMDProcessor.java
	src/com/android/settings/util/Helpers.java
Update HALO icons

Picked from AICP
Add Missing Halo Ninja Mode

Signed-off-by: aways <aways@c-rom.org>

Conflicts:

	res/values/crom_strings.xml

Change-Id: If7e7055b7c2b893349b51f8d3a6a6614d8e71ce4
Updates for HALO

Signed-off-by: aways <aways@c-rom.org>
[2/2] Settings: implement App circle sidebar

Change-Id: I351486c82b97f810d7d96682beee611f90320f34
Reorganize interface

Change-Id: I3c05a17b9399e39c54982eabd9cca19a34ec52f9
Quick Settings: Option to use floating window (2/2)

Allows the option of launching preferences from the quicksettings menu in a
floating window

Change-Id: I00237f6b667d35f0e8d2cf8201f4efee6adf762c

Conflicts:

	res/values/cm_strings.xml
	res/xml/quick_settings_panel.xml
[settings] long press back to kill configurable timeout (2/2)

1 - 2 seconds (default)
2 - 1,5 seconds
3 - 1 second
4 0,5 second

Change-Id: Ie411efcc752d5827408ec15a08435e66178e355f

Conflicts:

	res/values/cr_arrays.xml
	res/values/cr_strings.xml
Remove CM updater, CM statistics and changelog

Change-Id: I468c2618f94ce4605ffc716abceebb030298a152

Conflicts:

	src/com/android/settings/DeviceInfoSettings.java
[SQUASHED] Lockscreen Notifications (2/2)

Following commits inside (with minor adaptations)
https://github.com/AOSPAL/android_packages_apps_Settings/commit/10ccffd1ca698aa204479d1c935a3ce3fa47edb2
https://github.com/AOSPAL/android_packages_apps_Settings/commit/17c7bcf21b56a8d977b26f62921d58a3db024a98
https://github.com/AOSPAL/android_packages_apps_Settings/commit/db6757742959c983d2a3477c217fe68e870a6969
https://github.com/AOSPAL/android_packages_apps_Settings/commit/8fc910a7d0a3d559b125706ddf4b65b71bada6c1
https://github.com/AOSPAL/android_packages_apps_Settings/commit/a73649abfce893d99ddc902a04d495970c0f117f
https://github.com/AOSPAL/android_packages_apps_Settings/commit/9b8a305b968018ab4b26fd35720a1e98ccd3852c
https://github.com/AOSPAL/android_packages_apps_Settings/commit/cb18eca4bf63833428b4487c54b1bc3b1b96f66b
https://github.com/AOSPAL/android_packages_apps_Settings/commit/b2ff326f86c6641486dc92de9e02c36a727f5040

Change-Id: Ib13c39cb67839bec92a660000eae23bdb7fdfa30

Conflicts:
	res/values/cr_dimens.xml

Conflicts:

	res/values/cr_dimens.xml
	res/values/cr_strings.xml
	src/com/android/settings/SettingsPreferenceFragment.java
Disable lockscreen notifications by default and all the other options inside

Change-Id: Ie7dab7f57e502cc98b9b9cd6c435d33e1853cb40