[2/2] Change to SlimRoms style battery styles

Credit to SlimRoms and Mahdi-Rom

Squashed commit of:
	Revert - 880f6e444639660504a76841a5b64d40b060c303
    Revert - 3e38e1ffe35bc680ce7a25f24894668196763763

Lets hope it builds :D

Signed-off-by: Chintan Shah <cgintan1998@gmail.com>

Conflicts:

	res/values/mahdi_arrays.xml
	res/values/mahdi_strings.xml
	res/xml/status_bar.xml
	src/com/android/settings/Settings.java
	src/com/android/settings/mahdi/StatusBar.java
Clean-up of AppCircleBar code

Signed-off-by: Chintan Shah <cgintan1998@gmail.com>