Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d10048a7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't animate the power button dialog when swiping up dismiss shade"... 

Merge "Don't animate the power button dialog when swiping up dismiss shade" into tm-qpr-dev am: 2f47e8a8 am: c77b56a5 am: e7da4e16

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21611513



Change-Id: I4a8c81c10048c47f6b4ace4ce9d9ac5e7ee9d754
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b99f9311 e7da4e16

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java

+4 −0
Original line number Diff line number Diff line
@@ -2056,6 +2056,10 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene 
                    || 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)) {