halo text color

Change-Id: Iaf2fa3d833b48d64a9b90f9459cb1cb0470a10a3
fix

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

Change-Id: Ifb0f4e8abdce1ed3d4cc4c973edc08794781db64

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java