Battery text mode (2/2)

Change-Id: I681977537c19c1492119ce8a81ee25d4a6f6aabe

Conflicts:
	res/values/liquid_strings.xml
	res/values/ose_arrays.xml
	res/xml/liquid_statusbar_settings.xml
	src/com/android/settings/liquid/StatusBarSettings.java