Lockscreen battery level around unlock ring
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: I9cbe2ff9c2a9ebb7d43920d43a659d644c5f2f94
qs tile flip 2/2
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: I8b234900118aac7138a7a8f923a6c050987e82f0
AOKP custom system animations (2/2)

ported fom here: http://gerrit.aokp.co/#/c/12305/

Thanks to Steve Spear

Change-Id: Ic93fc795c4600784a423f2e9b5b1984c7aabb7cb
Signed-off-by: scott <scott@ubuntu.com>

Conflicts:
	AndroidManifest.xml
	res/values/cm_strings.xml
	res/xml/system_ui_settings.xml
	src/com/android/settings/SettingsPreferenceFragment.java

Conflicts:
	res/values/strings.xml
density changer overhaul
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: Id5b3777dcf2793cd34ed7fb5fba4127c47aab940
Add halo floating options
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: I2a614861b23c4566e9e5b489f9d80d9e8ee5e522
Option to enable Notification Light when screen is on (2/2)
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: Ie1c0dc71976264f08e2a3bacae017c9a0955bf15
missed import
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: Ie0bd138c4b84142e138805b10ff239a4cd5dc6ce
[2/2] settings: add CPU info overlay

this shows
CPU temp (if available)
for every core governor + online + freq

Change-Id: I28c1e48c2e613b33c301b61cead70678ab6a2e9b
Signed-off-by: scott <scott@ubuntu.com>

Conflicts:
	res/values/custom_strings.xml

Conflicts:
	res/values/strings.xml
Active display: Allow apps to be excluded from being displayed [2/2]

Change-Id: Ieb6368c050f5b46eec7398ab0162dc4fbf00a392
Signed-off-by: scott <scott@ubuntu.com>

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

Conflicts:
	res/values-de/ck_strings.xml
	res/values/ck_strings.xml
	src/com/android/settings/cyanogenmod/ActiveDisplaySettings.java

Conflicts:
	res/values/cm_strings.xml
	src/com/android/settings/beanstalk/ActiveDisplaySettings.java
Fix up AD.
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: I45dcc3e7b07f5b1e7a3dbea081af41c4d47a3290
Settings: Fix SmsCallService Wakelock

This is a modifided pick from AKOP http://gerrit.aokp.co/#/c/12910/

Change-Id: Ibd51b2d43186edd07a747f72b931e875cd78b3e6

Conflicts:
	src/com/android/settings/service/SmsCallService.java
	src/com/android/settings/vanir/autosms/AlarmReceiver.java
Settings: Ability to Enable/Disable Smart Wake covers

Change-Id: I4339245881d682a653b84a1b8ef57182e650156e
Signed-off-by: scott <scott@ubuntu.com>

Conflicts:
	res/values/slim_strings.xml
	src/com/android/settings/DisplaySettings.java
Merge branch 'beanstalk' of github.com:chrisc93/android_packages_apps_Settings into beanstalk