Last code derp I promise after swipe patch

Change-Id: Ibe45ff6ae3e3b56d2fc2c4086d570a652ea9f2e4

Conflicts:
	packages/SystemUI/src/com/android/systemui/recent/RecentsActivity.java
	packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

Move some things to the correct place

Fixes

Moar fixes

add stuff, WILL BE SQUASHED LATER!

SQUASH LATER!

SQUASHY SQUASHY

MOAR SQUASHING

squash

meh

omg