[2/2] CarbonFibers: Pimp up ActiveDisplay

Base part: http://review.carbon-rom.com/#/c/1370/

PS2: fix merge conflict

Conflicts:

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

Change-Id: I8abf7a3018e7e0168860861ac240975cd1f8a2b0

Conflicts:

	res/xml/active_display_settings.xml

Change-Id: I8abf7a3018e7e0168860861ac240975cd1f8a2b0
[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