| commit | c77b56a5ccae218e851d852effbdc2708a259796 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Mar 02 11:07:49 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 02 11:07:49 2023 +0000 |
| tree | 6440164fa5fad4006824df4266a593ce99d2bd95 | |
| parent | 35db892ed540158dd1c7d10cfe9fd50eb28c19bb [diff] | |
| parent | 2f47e8a84edcc172755919d6cc2f6c670fa46864 [diff] |
Merge "Don't animate the power button dialog when swiping up dismiss shade" into tm-qpr-dev am: 2f47e8a84e Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21611513 Change-Id: I36c92cc791d343cc55e5cb78295c134426fa56a7 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 e80e71c..03b45b5 100644 --- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java
@@ -2054,6 +2054,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)) {