Revert "HALO (2/2) #2"

This reverts commit 58e0527e7b51ffcb8934a10882bbe275c48eda33.

Conflicts:

	res/values/strings.xml
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java