fix reversed actions

Change-Id: Id7f4509177eb339d23dbee31e79cf33b2bc5a92e

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