api
Halo: Add master switch to disable Halo (1/2)

Signed-off-by: Paul Beeler <sparksco@gmail.com>

mbc596

Conflicts:
	core/java/android/provider/Settings.java
Frameworks: Toggle to disable fullscreen keyboard (1/2)

Conflicts:

	core/java/android/provider/Settings.java

Change-Id: Id133925d659ea7e8589aec1ea3200bc6247da7cc

Conflicts:
	core/java/android/provider/Settings.java
Translates
Display options: allow configuration of wake on plug behavior

Conflicts:
	services/java/com/android/server/power/PowerManagerService.java
Power connect/disconnect notification
Fix location (2/2)
Thanks equlog
First part in device/lge/mako

Conflicts:
	core/res/res/values/config.xml
Change animations
Change animations
Change animations
Change animations
Change animations
Change animations speed
ListView Animations (1/2)

Credits to Team ThinkingBridge

Change-Id: I779a35402727ede46f969607ac33cf31dc53515f

multi users support

Change-Id: I08517d34181a0b8ec50bb3a2e9f121b71dad4f77

update and bug fix

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

Conflicts:
	core/java/android/provider/Settings.java

Conflicts:
	core/java/android/provider/Settings.java

Conflicts:
	core/java/android/provider/Settings.java

Conflicts:
	core/java/android/provider/Settings.java
SystemUI: Notifictation counter

Change-Id: I65a0575b3d0f3be34d9e6cb4b512196258361fd7

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java

Conflicts:
	core/java/android/provider/Settings.java

Conflicts:
	core/java/android/provider/Settings.java
Add active display to ChameleonOS [1/2]

This is the ChameleonOS implementation of the active
display feature, similar to that found on the Moto X.

When enabled the screen will turn on and display the
incoming notification.  The user can then open the app
for the notification, dismiss the notification or unlock
their device normally.

Additional notifications, if any exist, will be displayed
below the ring notification and can be viewed by touching
the notification icon.  The user can simply slide their
finger across these other notification to quickly view
them.  The last one touched will remain in the ring and
the user can then perform any of the actions listed above.

PS2-PS12:
All the changes that brought us to this current implementation.

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

Conflicts:
	core/java/android/provider/Settings.java
	core/res/res/values/dimens.xml
	core/res/res/values/symbols.xml
	packages/SystemUI/AndroidManifest.xml
	packages/SystemUI/res/values/dimens.xml
	packages/SystemUI/res/values/styles.xml
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java

Conflicts:
	core/res/res/values/dimens.xml
	packages/SystemUI/AndroidManifest.xml
	packages/SystemUI/res/values/dimens.xml
	packages/SystemUI/res/values/styles.xml
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

Conflicts:
	core/java/android/provider/Settings.java
	core/res/res/values/dimens.xml
	packages/SystemUI/AndroidManifest.xml
	packages/SystemUI/res/values/dimens.xml
	packages/SystemUI/res/values/styles.xml
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

Conflicts:
	core/res/res/values/dimens.xml
	packages/SystemUI/res/values/dimens.xml
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
Correct active display settings naming

Change-Id: Ibfa2d41eed01d8987df52f013b111a0ce4e70739

Conflicts:
	core/java/android/provider/Settings.java
Replace Active Display Icons

MDPI -> HDPI - HDPI -> XHDPI...
Signed-off-by: aways <aways@c-rom.biz>

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

Conflicts:
	packages/SystemUI/res/drawable-hdpi/ic_ad_dismiss_notification_activated.png
	packages/SystemUI/res/drawable-hdpi/ic_ad_dismiss_notification_normal.png
	packages/SystemUI/res/drawable-hdpi/ic_ad_morenotifications.png
	packages/SystemUI/res/drawable-hdpi/ic_handle_notification_normal.png
	packages/SystemUI/res/drawable-xhdpi/ic_ad_dismiss_notification_activated.png
	packages/SystemUI/res/drawable-xhdpi/ic_ad_dismiss_notification_normal.png
	packages/SystemUI/res/drawable-xhdpi/ic_ad_morenotifications.png
	packages/SystemUI/res/drawable-xhdpi/ic_handle_notification_normal.png

Change-Id: Ib05001f3c2dd22e8251b06e60d9cd19d4cb64d66
Replace Active Display Icons

MDPI -> HDPI - HDPI -> XHDPI...
Signed-off-by: aways <aways@c-rom.biz>

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

Conflicts:
	packages/SystemUI/res/drawable-hdpi/ic_ad_dismiss_notification_activated.png
	packages/SystemUI/res/drawable-hdpi/ic_ad_dismiss_notification_normal.png
	packages/SystemUI/res/drawable-hdpi/ic_ad_morenotifications.png
	packages/SystemUI/res/drawable-hdpi/ic_handle_notification_normal.png
	packages/SystemUI/res/drawable-xhdpi/ic_ad_dismiss_notification_activated.png
	packages/SystemUI/res/drawable-xhdpi/ic_ad_dismiss_notification_normal.png
	packages/SystemUI/res/drawable-xhdpi/ic_ad_morenotifications.png
	packages/SystemUI/res/drawable-xhdpi/ic_handle_notification_normal.png

Change-Id: Ib16f90946bee4b75f18bb7934b7ee4125ef31682
Active display: Add sunlight mode. [1/2]

Change-Id: I541e74c5a1a7e6ce5028ab00cf998bba1d4fe0f9

Conflicts:
	core/java/android/provider/Settings.java

Conflicts:
	core/java/android/provider/Settings.java