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
Settings : Switch state fix

Since the switch views are shared, we need to recreate them
in order to prevent from being reused as they don't share state.

Change-Id: I4d7038f37883e1791c8c2b0009f0adb85ebb2b88
Merge branch 'cm-4.4' of https://github.com/cristianomatos/android_packages_apps_Settings into cm-11.0

Conflicts:
	res/values/cr_strings.xml