Cleanup battery style code

Change-Id: I50c347af17ce0ddef1f887586d0aca54843b8e63

Conflicts:

	res/xml/status_bar_settings.xml
	src/com/android/settings/cyanogenmod/StatusBarSettings.java