Revert "Add active display to ChameleonOS [1/2]"

This reverts commit 22c7bf1e1292d96e9fa5d3fe85642333ae9c886c.

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/res/layout-land/active_display_content.xml
	packages/SystemUI/res/layout-sw600dp/active_display_content.xml
	packages/SystemUI/res/layout/active_display_content.xml
	packages/SystemUI/res/values/dimens.xml
	packages/SystemUI/src/com/android/systemui/statusbar/policy/activedisplay/ActiveDisplayView.java

Change-Id: I59946ae787c8e968e2883f5a283e8a99be775723
Revert "Active display: Add options for date and am/pm [1/2]"

This reverts commit 18801a375458237ca8a6cfc58e44b350c9997f9a.

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/res/layout-land/active_display_content.xml
	packages/SystemUI/res/layout-sw600dp/active_display_content.xml
	packages/SystemUI/res/layout/active_display_content.xml
	packages/SystemUI/res/values/dimens.xml
	packages/SystemUI/src/com/android/systemui/statusbar/policy/activedisplay/ActiveDisplayView.java

Change-Id: I9adea4b94fa83bbb9e6ef8c3610d17bfdca6be53
Revert "Camera button support: make it actually work"

This reverts commit ca10a37a80892ca9faf025b1c52bda94a94af94c.

Conflicts:
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

Change-Id: Ib1aceb98d91e350fa3fe6ee6e1a251d410fe86ca
Revert "Camera button support (1/2)"

This reverts commit 118aefcf2f6407c6d9582ece4c153266c2e86df4.

Conflicts:
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

Change-Id: Ib3c0f262965dbf1e2cfe69f02b8f95c9c8992ecc
Camera button rebinding and lockscreen action additions (1/2)

Adds new config_deviceHardwareKeys bitmask for camera button.
Lets you rebind the camera press/longpress and adds a new KEYCODE_CAMERA handler to inject a longpress KeyEvent
in order to let you bind keys to actually trigger the shutter, in addition to launching the app itself.

This also adds KEYCODE_ASSIST and KEYCODE_APP_SWITCH to the available keys to assign longpress lockscreen actions to.

Change-Id: I63583dbbaa0f6a3d21724f4948f86bb01e44b71b

Conflicts:
	core/java/android/provider/Settings.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
fix

Change-Id: I17d859934e652a54d07ef934e4b7faacd4eaf189
fix

Change-Id: I9501f73bab8e4b8767d900d940b1da7d62748bf0
fix

Change-Id: Id02993878c47d1844441c9d91e23d67335550e9e
fix

Change-Id: I2992e94fd62863a02100ec8910579992866777cf
Framework: Add Home/Back buttons available for rebinding (1/2)

Finally, we can disable or rebind all hardware buttons!
Also adds Expanded desktop toggle and Notification shade toggle

Change-Id: I0ca51c25e8434696a514fd1ef1e1e33543bf066a

Conflicts:
	core/java/android/provider/Settings.java
	core/res/res/values/strings.xml
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
small cleaning

Change-Id: I24475a57056f3e7d3c266dba06187d04446daf3d
Merge branch 'cm-10.2' of github.com:CyanogenMod/android_frameworks_base into cm-10.2
Merge branch 'upstream/cm-10.2'