[2/2] CarbonFibers: Fix pimp up ActiveDisplay

Base part: http://review.carbon-rom.com/1373

Conflicts:

	res/values/custom_arrays.xml
	res/values/custom_strings.xml

Change-Id: Ief2aa6802ad25a86b49d06bab1b9e34140dc5db5

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	res/xml/active_display_settings.xml
	src/com/crom/tools/fragments/ActiveDisplaySettings.java