Add active display - Credit ChameleonOS
Signed-off-by: Kristofer Ard <kristoferard@gmail.com>
Fix build
Signed-off-by: Kristofer Ard <kristoferard@gmail.com>
Active display: Add options for date and am/pm [2/2]

Change-Id: I6af47b2fd47e77398eee98cc6e30b8fcf1a44d45
Active display: Add sunlight mode. [2/2]

Change-Id: I513c2ef1555ca48dfb553f80ca687d1ca9f27c55
Active display: Option to change display timeout [2/2]

Change-Id: I2cb0252dac6563517f28123f5de0a40f4bb824bc
Signed-off-by: Kristofer Ard <kristoferard@gmail.com>

Conflicts:
	res/values/cm_arrays.xml
	res/values/cmx_strings.xml
Active display: allow hiding low priority notifications [2/2]

Change-Id: I244743ed1a32f59065af3c4507f4132b7d3b0d72
Active display: Allow apps to be excluded from being displayed [2/2]

Change-Id: Ieb6368c050f5b46eec7398ab0162dc4fbf00a392

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

Conflicts:
	res/values-de/ck_strings.xml
	res/values/ck_strings.xml
	src/com/android/settings/cyanogenmod/ActiveDisplaySettings.java
Remove these
Signed-off-by: Kristofer Ard <kristoferard@gmail.com>
Add SeekBarPreference
Signed-off-by: Kristofer Ard <kristoferard@gmail.com>
More seekbar shit
Signed-off-by: Kristofer Ard <kristoferard@gmail.com>
Merge branch 'halo' into jb-mr2

Signed-off-by: Kristofer Ard <kristoferard@gmail.com>

Conflicts:
	res/xml/system_ui_settings.xml