Revert "Battery text mode (2/2)"

This reverts commit 87ee529839bb3cb8343db6d576b4ad8401505c56.

Conflicts:
	res/values/cm_strings.xml
	res/xml/status_bar_settings.xml
Battery text mode (2/2)

PS5: More configuration
PS7: Rebased and changed topic

Change-Id: I13bdf2236811f535b0ac324b5b78c0ab12f365a6
Signed-off-by: kecinzer <kecinzer@gmail.com>

Conflicts:
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/xml/status_bar_settings.xml
	src/com/android/settings/cyanogenmod/StatusBarSettings.java
Fix Battery Text

(cherry picked from commit d93d5412e17cc1cb3ba45d130b8c59d29595f26a)

Conflicts:
	res/values/cm_strings.xml