2/2 Pimp up ActiveDisplay

Change-Id: I0ce652e453acd29555531b1d6936037ccfb41c76
Signed-off-by: Scott <scott@ubuntu>

Conflicts:
	res/values/bs_arrays.xml
	res/xml/active_display_settings.xml
	src/com/android/settings/beanstalk/ActiveDisplaySettings.java