Fix up active display options layout.  (Fixes force close)
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: I5ba46e771895ccf7e437f0bfb51ee788906cb636

Conflicts:
	res/values/attrs.xml
	res/xml/active_display_settings.xml
Active display: Add sunlight mode. [2/2]

Change-Id: I513c2ef1555ca48dfb553f80ca687d1ca9f27c55

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