squashed revert of weather header.. still needs work and causes
periodic systemui crashes especially with themes being changed

Change-Id: I4281911dfae2816ff7291f6a7e474e5e06e6f342
Signed-off-by: scott <scott@ubuntu>
Revert "Halo: Add master switch to disable Halo (1/2)"

This reverts commit 349aab875d983a47574f42be6c9b7029637f71fe.

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

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

Change-Id: I2183f55f75ad67335f02b156dc815adf71f37b72
HALO & Reminder: Remove Halo enable icon, add setting (1/2)

Fixes Reminder layout
Fixes Reminder quiet hours dependancy

Change-Id: I637da2706f04d4f51f354c192060419c24cf951f
Signed-off-by: scott <scott@ubuntu>

Conflicts:
	packages/SystemUI/res/drawable-hdpi/ic_notify_halo_normal.png
	packages/SystemUI/res/drawable-hdpi/ic_notify_halo_pressed.png
	packages/SystemUI/res/drawable-mdpi/ic_notify_halo_normal.png
	packages/SystemUI/res/drawable-mdpi/ic_notify_halo_pressed.png
	packages/SystemUI/res/drawable-xhdpi/ic_notify_halo_normal.png
	packages/SystemUI/res/drawable-xhdpi/ic_notify_halo_pressed.png
	packages/SystemUI/res/drawable-xxhdpi/ic_notify_halo_normal.png
	packages/SystemUI/res/drawable-xxhdpi/ic_notify_halo_pressed.png
	packages/SystemUI/res/layout/status_bar_expanded_header.xml
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
FWB: Hover enable from Settings (1/2)

I don't like beeing terorized with halo icon in
expanded statusbar all the time.
Add a setting to AICP extras for Hover

Change-Id: Ie3feb8925ea21f429e7c6138e64d639d8a9a876c
Signed-off-by: scott <scott@ubuntu>

Conflicts:
	packages/SystemUI/res/layout/status_bar_expanded_header.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
systemui: Unbreak the planet

 * Not sure who to blame, but it's probably themes... :)

Change-Id: I0c534354a699f756d809aff10843ebea21f3f369
[2/2] Base: Clock on lockscreen

Allow to enable status bar clock on lockscreen (default off)

Change-Id: I80014df8544b149dbf6fb5b846d922f4ed09427e
Signed-off-by: scott <scott@ubuntu>

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