[squashed] Halo colors (1/2)
This commit contains:
b897b80c36
57e69e5300
242d0d567c
65fc7bb4a1
0b1f2ebf1a
d5f021b1da

Change-Id: I9acd2d202914e230e0d7d4c6665b40c70036fe7a

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/halo/Halo.java
	packages/SystemUI/src/com/android/systemui/statusbar/halo/HaloProperties.java
Active Display: Add always show pocket mode…

[1/2] [log]

Currently pocket mode is either on or off and when no
notifications are available it doesn't turn on.  This
adds an option to allow active display to come on even
when no notifications are available, showing the time
and allowing the user to unlock the device.

Change-Id: I14043256e0202b497c0e9f3c64aa796c1b2becac

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/policy/activedisplay/ActiveDisplayView.java

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/policy/activedisplay/ActiveDisplayView.java