HALO : Effect color

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

Change-Id: Ie2df31dbd9a012de5faff3c6cf653dc3b4bb5c10