Frameworks: Battery Styles customizations (1/2)

Fix for Chameleon

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/res/layout/quick_settings_tile_battery.xml
	packages/SystemUI/res/layout/status_bar.xml
	packages/SystemUI/res/values/styles.xml
	packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java