first commit
Merge branch 'cm-11.0' of github.com:CPA-Poke/CM_packages_apps_Settings into cm-11.0
Credit for original commit goes to SlimRoms.

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