[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/res/drawable-xhdpi/halo_silence_left.png
	packages/SystemUI/src/com/android/systemui/statusbar/halo/Halo.java
	packages/SystemUI/src/com/android/systemui/statusbar/halo/HaloProperties.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java