Merge branch 'cm-10.2' of https://github.com/CyanogenMod/android_frameworks_base into DJL10.2

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java
Add active display to ChameleonOS [1/2]

This is the ChameleonOS implementation of the active
display feature, similar to that found on the Moto X.

When enabled the screen will turn on and display the
incoming notification.  The user can then open the app
for the notification, dismiss the notification or unlock
their device normally.

Additional notifications, if any exist, will be displayed
below the ring notification and can be viewed by touching
the notification icon.  The user can simply slide their
finger across these other notification to quickly view
them.  The last one touched will remain in the ring and
the user can then perform any of the actions listed above.

PS2-PS12:
All the changes that brought us to this current implementation.

Change-Id: I51c17cec33b65dc60111a10c5ca2c449596ebe63

Conflicts:
	core/java/android/provider/Settings.java
	core/res/res/values/dimens.xml
	core/res/res/values/symbols.xml
	packages/SystemUI/AndroidManifest.xml
	packages/SystemUI/res/values/dimens.xml
	packages/SystemUI/res/values/styles.xml
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
Correct active display settings naming

Change-Id: Ibfa2d41eed01d8987df52f013b111a0ce4e70739

Conflicts:
	core/java/android/provider/Settings.java
Active display: Add options for date and am/pm [1/2]

Change-Id: Idc09772829cc6aa9bcfb064459fb3557c7b37f6b

Conflicts:
	packages/SystemUI/res/values/dimens.xml
	packages/SystemUI/res/values/donottranslate.xml
Active display: Add sunlight mode. [1/2]

Change-Id: I541e74c5a1a7e6ce5028ab00cf998bba1d4fe0f9
Delay hiding systemui by 100ms
When disabling the keyguard, the systemui visibility is
changed and can occur after we hide it so delaying this
a bit resolves that issue.

Change-Id: Iad432f75195983837d643fa38495e6beb54f3e22
Fix active display

Change-Id: I312411911a647f7cc0828b2736c6c182f8de4044
Revert "PackageManager: Let system-defined permissions take precedence over settings"

This reverts commit 120aee8e8ee0a6fce14b13adae2cc7c7c0513671.

This commit broke Active Display from ChameleonOS
Merge branch 'DJL10.2' of github.com:DJL10-2/android_frameworks_base into phone