[2/2] OmniGears: Pimp up ActiveDisplay

Base part: https://gerrit.omnirom.org/#/c/2819/

Change-Id: I8abf7a3018e7e0168860861ac240975cd1f8a2b0

Conflicts:
	res/values/custom_arrays.xml
	res/values/custom_strings.xml
	res/xml/active_display_settings.xml
	src/com/android/settings/crdroid/ActiveDisplaySettings.java
[2/2] OmniGears: Fix pimp up ActiveDisplay

Base part: https://gerrit.omnirom.org/#/c/3380/

Change-Id: Ief2aa6802ad25a86b49d06bab1b9e34140dc5db5

Conflicts:
	res/values/custom_arrays.xml
	res/values/custom_strings.xml