Settings: Support for the new battery style

Revert "settings: Add text plain battery style"

This reverts commit 20deb49bd4cd805e5901a42368cb9a7b3c28fdeb.

Conflicts:

	src/com/android/settings/cyanogenmod/StatusBar.java

Change-Id: I6118c8e2a6f1b39fb461dc35105c5eabc8e2f75f

Revert "settings: Add dock battery support"

This reverts commit 390f16ade59e1ed517da612f65ff8c9dca1b2bb5.

Conflicts:

	res/values/cm_strings.xml
	src/com/android/settings/fuelgauge/BatteryHistoryDetail.java
	src/com/android/settings/fuelgauge/BatteryStatsHelper.java
	src/com/android/settings/quicksettings/QuickSettings.java

Change-Id: I9bf603f329c3fe7b8268b0c3317901b78c56d8b8

Revert "Forward Port Circle Battery"

This reverts commit 942daf80e2d0d60e18e7f71ec99c22f6e8621e99.

Conflicts:

	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/xml/status_bar.xml
	res/xml/system_ui_settings.xml
	src/com/android/settings/cyanogenmod/StatusBar.java

Change-Id: I90ece7eac09c8990716204eb43c6704ee50fc1de

Conflicts:
	res/values/cm_strings.xml
	src/com/android/settings/cyanogenmod/StatusBar.java
	src/com/android/settings/quicksettings/QuickSettings.java
settings: add Battery Styles the new way 2/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: I060441acf40100927c1acda36144052df4995cec
Signed-off-by: Scott <scott@ubuntu>

Conflicts:
	res/values/bs_arrays.xml
	res/values/bs_strings.xml

Conflicts:

	res/values/bs_arrays.xml
	res/values/bs_strings.xml
	res/xml/status_bar_settings.xml

Conflicts:

	res/xml/status_bar.xml

Conflicts:
	res/values/axxion_arrays.xml
	res/values/spirit_strings.xml
	res/xml/status_bar.xml
	src/com/android/settings/Settings.java
[2/2] Settings: Adding old-school (JB like) battery percents style
It has better visibility.

How does it look like:
https://dl.dropboxusercontent.com/u/66673431/BattModPercentScreen1.jpg
https://dl.dropboxusercontent.com/u/66673431/BattModPercentScreen2.jpg

Adding "No battery" style

Fixing menu items locking

Adding line for circle charging color

Moving new style to the end to save previous styles order

Fixing incorrect menu item unblock

Frameworks change: https://gerrit.slimroms.net/#/c/5623/

Change-Id: I43dc7fa4a5ba5a6151f8e60eb1190e261be59c5d

Conflicts:

	res/values-ru/slim_strings.xml
	res/values/slim_arrays.xml
	res/values/slim_strings.xml

Conflicts:
	res/values/axxion_arrays.xml
	res/values/spirit_strings.xml
Settings: Fix build