| commit | e7da4e16a2de372a3fe7a715ab6629745559414e | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Mar 02 11:45:32 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 02 11:45:32 2023 +0000 |
| tree | 9537102874493dfffd2faae4efc6c7f4e3f24338 | |
| parent | b68e21e9de0c107f29219b575cea9ecd5d2a0596 [diff] | |
| parent | c77b56a5ccae218e851d852effbdc2708a259796 [diff] |
Merge "Don't animate the power button dialog when swiping up dismiss shade" into tm-qpr-dev am: 2f47e8a84e am: c77b56a5cc Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21611513 Change-Id: Ie5a21605d6699059a01f3b57d0bc9622783ac766 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java index 949bcfb..e43f83b 100644 --- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java
@@ -2056,6 +2056,10 @@ || Intent.ACTION_SCREEN_OFF.equals(action)) { String reason = intent.getStringExtra(SYSTEM_DIALOG_REASON_KEY); if (!SYSTEM_DIALOG_REASON_GLOBAL_ACTIONS.equals(reason)) { + // These broadcasts are usually received when locking the device, swiping up to + // home (which collapses the shade), etc. In those cases, we usually don't want + // to animate this dialog back into the view, so we disable the exit animations. + mDialogLaunchAnimator.disableAllCurrentDialogsExitAnimations(); mHandler.sendMessage(mHandler.obtainMessage(MESSAGE_DISMISS, reason)); } } else if (TelephonyManager.ACTION_EMERGENCY_CALLBACK_MODE_CHANGED.equals(action)) {