Double entry
PhoneStatusBar: Readd headsup view when theme change occurs.

Change-Id: I5bbfa56650a1b2f9cd9c4365650f769bed009ab0

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

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
Launch Heads Up in floating window [1/2]

Change-Id: I530c3d9473e8b0600db047ce2137ee3d44592111

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationHelper.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

Conflicts:
	packages/SystemUI/res/values/arrays.xml
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
BaseStatusBar: Dismiss heads up on backpress.

Change-Id: I5b6191657cf0b74d825eb653a6e82c33e0527aad
Do not kill app when closing floating window
SystemUI: Clear disappearing children and remove HeadsUp on recreate.

    - Since some views animate in and out of visibility
    the call to removeAllViews on the mStatusBarContainer may still
    keep a reference to the view.

    - Also remove mHeadsUpNotificationView from the window manager if
    it's not null.

Change-Id: I5ced26e0f36362e89779bd7c6dac4d8235e0c0e9

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
HeadsUp: Only remove heads up if attached to window

Attempting to remove mHeadsUpNoficiationView from the window manager
when it is not currently attached will throw an IllegalArgumentException
so we check if it is attached and if so remove it, otherwise carry on.

Change-Id: Ida916eba496c4183e47288ef24a8a93c46a7eddf

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

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
ProximityWake : Add support for checking proximity when waking device [1/2]

Change-Id: Ia5ff446d88435773acccc7467e66009000dc20cb

Conflicts:
	core/java/android/os/IPowerManager.aidl
	core/java/android/provider/Settings.java
	services/java/com/android/server/power/PowerManagerService.java

Conflicts:
	core/java/android/os/IPowerManager.aidl
	core/java/android/provider/Settings.java
	services/java/com/android/server/power/PowerManagerService.java
HeadsUp: Correctly add and remove the window

isAttachedToWindow() basically works to determine if the view was attached or not.

But on the boot up process when already addHeadsUpView is called but the system is not
fully up and a recreation happens (eg on TRDS...due that the UIModeManager is doing its work as soon as system is ready)
the view gets attached....but not removed on the recreation due that at this time isAttachedToWindow() will return false even though the
window was added.

To solve simply use a boolean instead of isAttachedToWindow()

Change-Id: Ib576a83cadc581683f2a5b0afc922c53b01888b7

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
quickboot: Only enable QuickBoot if package is installed

 * Also move to Settings.Global

Change-Id: I87e1464d717b41437072523c0ecab52227d7888b

Conflicts:
	packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
	policy/src/com/android/internal/policy/impl/GlobalActions.java

Conflicts:
	packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
	policy/src/com/android/internal/policy/impl/GlobalActions.java

Conflicts:
	packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
	policy/src/com/android/internal/policy/impl/GlobalActions.java
Fix systemui crash on boot

The process com.android.systemui would crash after phone booting with a
java.lang.NullPointerException when the signal status style is set to text

Change-Id: Ia7b58fa93b8591d0571b90a57a2fe0fe823b3f45

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterTextView.java