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>
This commit is contained in:
TreeHugger Robot
2023-03-02 11:45:32 +00:00
committed by Automerger Merge Worker

View File

@@ -2056,6 +2056,10 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene
|| Intent.ACTION_SCREEN_OFF.equals(action)) { || Intent.ACTION_SCREEN_OFF.equals(action)) {
String reason = intent.getStringExtra(SYSTEM_DIALOG_REASON_KEY); String reason = intent.getStringExtra(SYSTEM_DIALOG_REASON_KEY);
if (!SYSTEM_DIALOG_REASON_GLOBAL_ACTIONS.equals(reason)) { 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)); mHandler.sendMessage(mHandler.obtainMessage(MESSAGE_DISMISS, reason));
} }
} else if (TelephonyManager.ACTION_EMERGENCY_CALLBACK_MODE_CHANGED.equals(action)) { } else if (TelephonyManager.ACTION_EMERGENCY_CALLBACK_MODE_CHANGED.equals(action)) {