Settings: Cleanup display settings code

Change-Id: Ib2a00bd7f7932ca6a75834e3cd5b4953d5b050de
Settings: fix MSim package names

Broke in a1e5ca59a74b57e36370fd501b56049b6261d8cc

Change-Id: I257c0ca2dc4e00b3a020b7cd68afffab39aae95d
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_strings.xml
	res/xml/status_bar_settings.xml
	src/com/android/settings/cyanogenmod/StatusBarSettings.java