interaction

Change-Id: I84e3a54ad778d3fa25c7477b2e4e84c8d7637bb3

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/Halo.java