first commit
Merge branch 'kk' of github.com:CPA-Poke/carbon_settings into kk
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: Iaedede55e14d99f79e560e74188692c894f2d961

Conflicts:

	res/values/slim_arrays.xml
	res/values/slim_strings.xml
	res/xml/ioscheduler_settings.xml
	src/com/android/settings/slim/InterfaceSettings.java