Settings: Support for the new battery style
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:
	AndroidManifest.xml
	res/values/spirit_arrays.xml
	res/values/spirit_strings.xml
	src/com/android/settings/Settings.java