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
Revert "Multiple commits for app sidebar support from ChameleonOS"

This reverts commit 650f6bbe0a85d36b1092289c28674984b01da573.

Signed-off-by: scotthartbti <scott.hart.bti@gmail.com>

Conflicts:
	res/values/attrs.xml
	res/values/strings.xml

Change-Id: I1ddbaabc7ee202fed4d8d18691644d9c0e85942a
Sidebar 2.0

i think this may be ready for primetime.  still have a lot of stuff to add though.
continuation of http://vaniraosp.goo.im/#/c/3028/

Change-Id: I359d7ded0babb1d5438a8c8c4e31f5f81808eba5
Signed-off-by: scotthartbti <scott.hart.bti@gmail.com>
Signed-off-by: scott <scott@ubuntu.com>

Conflicts:
	res/values/arrays.xml
	res/values/attrs.xml
	res/values/strings.xml
	res/xml/vanir_settings.xml

Conflicts:
	res/layout/seek_bar_preference.xml
	res/values/attrs.xml
	res/values/strings.xml
restart systemUI on appbar toggle

just to make sure all the views are refeshed properly

Change-Id: Idd865c3862a0e2e38715f249e56e55456387eb1c
Appbar: Add a title summary > no more visual pain
Signed-off-by: scotthartbti <scott.hart.bti@gmail.com>

Change-Id: Ia1fa7ae44dc3745acd464fe810af985b6f8d4970
Fix a couple derps... shoulda tested before going live!
Signed-off-by: scotthartbti <scott.hart.bti@gmail.com>

Change-Id: Ic377144f8d2e5d73d4dd2020168dc10fe3b24e53
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
Revert "Fix a couple derps... shoulda tested before going live!"

This reverts commit 284cc35849297460ed5b0b2ce15dd92e0981c4f8.
Revert "Appbar: Add a title summary > no more visual pain"

This reverts commit 2efc8157df466a31d6c2957f7ac47f8a9e7c8f9b.
Revert "restart systemUI on appbar toggle"

This reverts commit c12016f51ebc36385acef3f78332c6107d4bb95c.
Revert "Sidebar 2.0"

This reverts commit 0622ef64e1dc96509a2a1e39d64ce5f74efcaa63.

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

Conflicts:
	res/values/strings.xml

Change-Id: I76f66d9bb27075fa96e93daf64def347c045521e
App sidebar [2/2]

- This implementation contains all the commits and chagnes of ChameleonOS until 18/07/2013

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

Conflicts:
	res/values/attrs.xml
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/xml/system_ui_settings.xml
	src/com/android/settings/cyanogenmod/SeekBarPreference.java
fixes?
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: I785b318a8b10dfd772e690da507eb96195ea880b
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
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