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
	src/com/android/settings/cyanogenmod/StatusBarSettings.java
Forward port battery icon option [2/2]

Bring forward the various battery icon options.

Still retains new options for where to show battery percentage text.

Change-Id: I75b3d9f4ba4b4206d2be5f2cd24ceceeae3234fc

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