Remove CM's Battery
Revert "Fix circle battery opaqueness for the low battery color"

This reverts commit 345bdd889f17fa65fa710499cf06394d1cd319cd.

Revert "Don't animate the circle battery meter when battery is fully charged"

This reverts commit 64bb3a2d3a61981bce0a50aece401b6ee3286488.

Revert "Animate circle battery rotation back to 0 after unplugging"

This reverts commit cd858e55ff916dda7d1ce0391c29bebb122c2857.

Conflicts:
	packages/SystemUI/src/com/android/systemui/BatteryMeterView.java

Revert "DockBatteryMeter: Avoid double detach when view is rebuilt"

This reverts commit fb04afb1b8ee90873de1b056cb566874ad5fca19.

fbase: Support for the new battery style

Revert "systemui: Add text plain battery style"

This reverts commit a6dab51d864cbf23a81cf3fcfb0ba3ee391533a2.

Conflicts:

	core/java/android/provider/Settings.java

Change-Id: Iea605894a39cb2e3371934aaec2ee13e6a350fed

Revert "Fix charging indication."

This reverts commit 5d3fe36b5f661e3c0b5973f3ea875297a26a9c1f.

Revert "systemui: Use the same color for circle battery than clock color"

This reverts commit 39c8d1565dce9b902ebd226ff4cd544c89c23553.

Revert "systemui: fix circle battery percentage alignment for low dpi devices"

This reverts commit 624d877d751edd2a022fefb9b708887e881f8aa8.

Revert "systemui: Fix hidden battery icon style"

This reverts commit e0e8d6be9ead1bceca36d26682e9cc5d766df29b.

Revert "base: Add dock battery support"

This reverts commit fafcb823ab8bc111e72ed108259ba8aa85dee4f0.

Conflicts:

	core/java/android/app/IBatteryService.aidl
	core/java/android/os/BatteryManager.java
	core/java/android/os/BatteryProperties.java
	core/java/android/provider/Settings.java
	core/res/res/values/cm_strings.xml
	packages/SystemUI/res/values/cm_strings.xml
	packages/SystemUI/src/com/android/systemui/DockBatteryMeterView.java
	packages/SystemUI/src/com/android/systemui/quicksettings/BatteryTile.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarTransitions.java
	services/java/com/android/server/am/BatteryStatsService.java

Change-Id: I4991b164e376c3600a786f6c37c2dd74fd6c4bcb

Revert "Battery icon tweaks."

This reverts commit d8595fd8feca567d48c4e271070a75c576a7dfbf.

Conflicts:

	packages/SystemUI/res/layout/status_bar.xml

Change-Id: I607906546c28cceef3f2c2e59aca0fd4bbd54131

Revert "Forward port circle battery."

This reverts commit 2903f9159e076261f1eaedd11d1dc4314dd5cee7.

Conflicts:

	packages/SystemUI/res/layout/status_bar.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarTransitions.java

Change-Id: Ide782ca726cd32ed8c678249f4979e249c2fc354

Conflicts:
	core/java/android/app/ContextImpl.java
	core/java/android/content/Context.java
	core/java/android/provider/Settings.java
	core/res/res/values/cm_strings.xml
	packages/SystemUI/res/layout/quick_settings_tile_dock_battery.xml
	packages/SystemUI/res/values/cm_arrays.xml
	packages/SystemUI/res/values/styles.xml
	packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
	packages/SystemUI/src/com/android/systemui/DockBatteryMeterView.java
	packages/SystemUI/src/com/android/systemui/quicksettings/BatteryTile.java
	packages/SystemUI/src/com/android/systemui/quicksettings/QuickSettingsTile.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarTransitions.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsController.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java
fb: add Battery Styles the new way 1/2

google draws now the battery icon which fits perfectly into our
concept. Beside that the batteryview is as well used on QS.
So we readd our battery icons (icon, percentage, icon with percentage
circle, circle perc, dot circle, dot circle perc) back and all are
drawn. As well the icon does not only change on statusbar as well
on QS it is reflected.

As usual color options are present for the User to style the icon

Change-Id: Iae9021af56a21b8d39efc5162186eb17ecc933e2

Conflicts:
	core/java/android/provider/Settings.java

Conflicts:
	packages/SystemUI/res/values/cr_strings.xml

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/colors.xml
	packages/SystemUI/res/values/spirit_colors.xml
	packages/SystemUI/res/values/styles.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/res/layout/quick_settings_tile_battery.xml
	packages/SystemUI/res/values/colors.xml
	packages/SystemUI/res/values/spirit_strings.xml
	packages/SystemUI/res/values/spirit_styles.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java

Add theme resources

(credit to cm)