another battery bar commit

Conflicts:

	src/com/android/settings/aokp/StatusBarBattery.java