halo text color option

Change-Id: I0a73eb7c110f8d3deba5e344ee728f2120099071
Halo: Add master switch to disable Halo (2/2)

Change-Id: Iafde2e47f4d7fdafdf49c475eba26a8437c52089

Conflicts:
	res/xml/halo_settings.xml
	src/com/android/settings/cyanogenmod/Halo.java