Remove unused variables and restore cancel trigger

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/view/PieMenu.java