clean-up, new options, getting rid of unneeded code

Change-Id: I62092bd712f962d67e9734a1bdf0d27bee61c8d9

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