supporting custom light levels (2/2)

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