Merge "[2/3] mediaeditor: Allow custom DOMX source instead of Google DOMX default" into jb-mr1
Revert "Merge "[2/3] mediaeditor: Allow custom DOMX source instead of Google DOMX default" into jb-mr1"

This reverts commit 387331f7d0590760e8e634c4935864e16d2f6dc7.
Quicksettings: fix updating 2G,LTE and WifiTether tiles
adding an observer to listen for state changes

also move updating torch and navbarhide

Change-Id: I8dc8f9d804fcd47daaec50f0169fd5148d494cc6
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>
AwesomeAction: Performance update

Use hashmap and switch case, also use containskey() to
bypass switch/case if its a custom app.

oops sorry marc
double oops..

rebase

Change-Id: I90b353df3de035c58e1871b8a3085c82f7d24145

Conflicts:

	packages/SystemUI/src/com/android/systemui/aokp/AwesomeAction.java
Lockscreen: remove mAppWidgetContainerHidden instead of hiding it

This will reduce memory usage.

Change-Id: I541ab53a98b84ce919998a322fa2b28a9621a9f9
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>

Conflicts:

	policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
Merge "[2/3] mediaeditor: Allow custom DOMX source instead of Google DOMX default" into jb-mr1
Camera : Powerkey shutter (1/2)

Allows user to use power key to take pictures/videos

Change-Id: I85a1e1761199f4604672be42a3a5005227f5451a

Conflicts:

	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
Sound Toggle: Improve logic with new icons.

Credits Icons: Oliver Geith
Revert "Lockscreen: remove mAppWidgetContainerHidden instead of hiding it"

This reverts commit 4c21d0909eab85b5e90556eb4ec43236b1ce0608.
PowerMenu: Security Feature (Toggle) to Hide Reboot (reboot recovery) 2/2

Added missing "}"
Changed "If" to "if"
Added POWER_DIALOG_SHOW_REBOOT_HIDE in Settings.java
Removed tabs...

PS7-8: Hide -> Show to get in-line with other feats. Show by default.

Change-Id: I2ceb4bf42e3f0350cf6b4764a0b8e032b32836a3

Conflicts:

	core/java/android/provider/Settings.java
	policy/src/com/android/internal/policy/impl/GlobalActions.java
Add ability to answer call with hardware HOME button (1/2)

(preparation for winter time)
------

<New edits>:
PS2: Fix port forward compatibility issues and fix up double if statement used in 4.1
PS3: Fix brace derp
Change-Id: I88ff168e3bb1accab9a531267812333c0ae68059

Conflicts:

	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
camera: add power mode support

Based on commit 7036d66bec7697160ba1b2e255f1e7fae0c8c435 from CAF,
branch ics_chocolate.

Change-Id: I8a60668b18980fd5e6f9dd341db5a8a63deb99d0
Camera: add ISO mode support

Change-Id: Ied2075f950269990d836fc768b2c6c36088d494f
transparent keyguard widget containers
Profiles: add PROFILES_STATE_CHANGED_ACTION broadcast intent

Added a new broadcast intent to profiles manager (PROFILES_STATE_CHANGED_ACTION), for
notify an event when profiles are enabled or disabled.

Change-Id: If701b3be54157c23acdf74e1da658fbce335437e
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
PIE: New options, hardware rendering, style changes (1/2)

https://github.com/ParanoidAndroid/android_frameworks_base/commit/5d84d160aaa517c695ce6ec756f38b39573b4c98

https://github.com/ParanoidAndroid/android_frameworks_base/commit/0648ddc8cf3b7bf4750a40fa701230a349c11ec9

https://github.com/ParanoidAndroid/android_frameworks_base/commit/4a6bd0d52e3eee2795c7e1290a5f954bdc66e994

Change-Id: Iba4464e00155a36c3820a08c89db2752a478ddc7

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/view/PieMenu.java
Revert "PIE: New options, hardware rendering, style changes (1/2)"

This reverts commit 515182e15ec8f1eda70fe6b2f4e6ce99ac94c36a.
PIE: animation revamped (back to the first draft), style changes

Change-Id: I9e521ed4f7be2df629f58d933bad286486ec4a71
Policy: fix keyguard statusbar showing while in ext desktop, fixes it in
apps like currents as well

Change-Id: Id3e4b99d60c33e4050e0e97c365d1ae739f603ec
hardware rendering for statusbarmanager and pie

Change-Id: I81dc4def0dffd9b494c52bb3dbc43f400d441f94

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java