Forward Port Circle Battery and Landscape Battery (2/2)

Revert "Settings: add Battery Styles the new way 2/2"

This reverts commit 6944b262c7bbb9c3bb7e408ac5e6ea1607ee5b2a.

Conflicts:
	res/xml/status_bar_settings.xml

Settings: Forward Port Circle Battery and Landscape Battery (2/2)

removed Slims battery options

Thanks to @Sven-Dawitz & @jruesga from CM

Conflicts:
	AndroidManifest.xml
	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

Conflicts:
	res/xml/status_bar_settings.xml
settings: Add text plain battery style
Adding Drawables

Conflicts:
	res/xml/navigation_bar_settings.xml