tidy up and move a few more
Add active display to ChameleonOS [2/2]

PS2:
Add pocket mode option, available if the device has
a proximity sensor.

PS3:
Add option to include ongoing and non-clearable notifications.

PS4:
Allow brightness control from 0% to 100%

PS5:
Refactor for release

Change-Id: Iae55640a31df68542c2af5d95097811b8fb1f66f

Conflicts:

	res/values/arrays.xml
	res/values/strings.xml
	res/xml/system_settings.xml

Conflicts:
	res/layout/seek_bar_preference.xml
	res/values/spirit_arrays.xml
	res/values/spirit_strings.xml
	res/xml/system_ui_settings.xml
gotta sleep more
Revert "Add active display to ChameleonOS [2/2]"

This reverts commit abdbc2f86210348315af2662895234b7af7aea8e.

Conflicts:
	res/layout/seek_bar_preference.xml
	res/xml/shift_ui_settings.xml