HALO colors improvements

Conflicts:
	res/values/strings.xml
	res/xml/halo_settings.xml
	src/com/android/settings/paranoid/Halo.java