CRT screen on/off animations user defined (2/2)

Conflicts:
	res/values/strings.xml
	res/xml/interface_settings.xml
	src/com/android/settings/carbon/InterfaceSettings.java