Frameworks: Re-work and clean up the Halo style code

Change-Id: I35e9aefbad4eef1e0b17282aefc2a2f88ae6304a

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