5 swatch, frameworks part

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java