HALO : Effect colors

Change-Id: I56dcc2327e687ff3621e5fb7e7a8ad55bc0aac05

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