HALO: Circle, Bubble, text colors

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/res/drawable-nodpi/bubble_black_l.9.png
	packages/SystemUI/res/drawable-nodpi/bubble_black_r.9.png
merge conflicts