Halo Speech Bubble Color + Text Color (2/2)

Conflicts:
	src/com/android/settings/paranoid/Halo.java