Active Display: Squash support commit [1/2]:

commit 9d2e19a79cc687b57e0f13e5ba8d9844ff45dc65
Author: xilence2210 <xilence2210@gmail.com>
Date:   Sun Oct 27 21:18:09 2013 +0800

    Introduce SeekBarPreference

    Change-Id: I28d5a9eefbfe33cdffa8f8782367e4ad455b19ec

commit 90ae09cf46612c2723f2fc9117c6a65d1627ba89
Author: 0xD34D <clark@scheffsblend.com>
Date:   Tue Oct 15 12:01:59 2013 -0700

    Active display: Allow apps to be excluded from being displayed [2/2]

    Change-Id: Ieb6368c050f5b46eec7398ab0162dc4fbf00a392

    Conflicts:
    	res/values/strings.xml

commit cee4580c88bf88a5bd0b17e433b052d276370638
Author: 0xD34D <clark@scheffsblend.com>
Date:   Fri Sep 27 12:51:31 2013 -0700

    Active display: allow hiding low priority notifications. [2/2]

    Change-Id: I244743ed1a32f59065af3c4507f4132b7d3b0d72

    Conflicts:
    	res/values/strings.xml

commit b7cdc728a2bd8b5b83d6888b582a2bdcbb93e2e1
Author: 0xD34D <clark@scheffsblend.com>
Date:   Thu Sep 19 13:56:18 2013 -0700

    Active display: Add sunlight mode. [2/2]

    Change-Id: I513c2ef1555ca48dfb553f80ca687d1ca9f27c55

    Conflicts:
    	res/values/strings.xml

commit 46ef8be8b566ba8bb40e1e079f9873fa7d615e2f
Author: 0xD34D <clark@scheffsblend.com>
Date:   Wed Sep 18 19:23:53 2013 -0700

    Active display: Add options for date and am/pm [2/2]

    Change-Id: I6af47b2fd47e77398eee98cc6e30b8fcf1a44d45

    Conflicts:
    	res/values/strings.xml

commit 20ad23588a5e892c16d8145f124dcf09fe651e81
Author: 0xD34D <clark@scheffsblend.com>
Date:   Sat Sep 14 13:18:54 2013 -0700

    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

Change-Id: Ie426e6d72eaf5982fed5425fb9f965770ba251d7