Re-work and clean up the Halo style code

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/halo/HaloProperties.java