add more battery charge icons

more battery icons 2nd

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/SbBatteryController.java

Change-Id: Iabe8b2cabc5514d541d9f628fbcf23b7a11961e3

derp

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

Change-Id: Ie44a42332392b92f3792cce0aa68826cc6397c26

more changes for battery icons

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

Change-Id: I04ee71a63ceb7f26e6fc07c63dd4ff6c546d976d

cleanup of batterystyle

Change-Id: Ib9456eb64a84a6632a4ef43edb5652273aed1244