HALO: Circle, Bubble, text colors

Conflicts:
	packages/SystemUI/res/drawable-hdpi/halo_bg.png
	packages/SystemUI/res/drawable-nodpi/bubble_black_l.9.png
	packages/SystemUI/res/drawable-nodpi/bubble_black_r.9.png
	packages/SystemUI/res/drawable-xhdpi/halo_bg.png
	packages/SystemUI/res/layout/halo_bubble.xml
	packages/SystemUI/res/layout/halo_speech.xml
	packages/SystemUI/src/com/android/systemui/statusbar/halo/HaloProperties.java

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/res/layout/halo_speech.xml
	packages/SystemUI/src/com/android/systemui/statusbar/halo/HaloProperties.java
HALO : Effect color

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

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/halo/Halo.java
	packages/SystemUI/src/com/android/systemui/statusbar/halo/HaloProperties.java
HALO colors: a lil improvement

Shouldn't break themeability this time, the custom colors has it's own halo bg

Conflicts:
	packages/SystemUI/res/drawable-hdpi/halo_bg.png
	packages/SystemUI/res/drawable-mdpi/halo_bg.png
	packages/SystemUI/res/drawable-nodpi/bubble_l.9.png
	packages/SystemUI/res/drawable-nodpi/bubble_r.9.png
	packages/SystemUI/res/drawable-xhdpi/halo_bg.png
	packages/SystemUI/res/values/colors.xml
	packages/SystemUI/src/com/android/systemui/statusbar/halo/HaloProperties.java

Change-Id: Icfbdfa2e0f44527a80f1e9365a243a654c61a9a2

Conflicts:
	packages/SystemUI/res/layout/halo_speech.xml
	packages/SystemUI/src/com/android/systemui/statusbar/halo/Halo.java
	packages/SystemUI/src/com/android/systemui/statusbar/halo/HaloProperties.java

Conflicts:
	packages/SystemUI/res/values/colors.xml
	packages/SystemUI/src/com/android/systemui/statusbar/halo/Halo.java
	packages/SystemUI/src/com/android/systemui/statusbar/halo/HaloProperties.java
HALO 2.0 Custom color settings update

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/halo/Halo.java
	packages/SystemUI/src/com/android/systemui/statusbar/halo/HaloProperties.java
Frameworks: fix build