Add option to turn off CRT effect [2/2]

PS2: Use 'FADE_ANIMATION' instead

PS3: Derp: forgot to convert some more lines in DisplaySettings.java

Change-Id: I4fe545014eb594353056aebd0b29cb06958d687e

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