HALO : Effect color

Signed-off-by: Kristofer Ard <kristoferard@gmail.com>

Conflicts:
	core/java/android/provider/Settings.java