Revert "last halo derp"

This reverts commit 36efd6e4f8414cd38646522f4bbb3e2fb60fdd68.
Revert "HALO 2/2"

This reverts commit df67638dfa42fe1a165e7ddcdf507ee75bd50ae0.

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
sloppy sloppy
ToastAnima:1/2