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

Commit 02274279 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android Git Automerger
Browse files

am 46f38ac3: am 4c3133a2: am cb326240: Merge "Correctly handle launch... 

am 46f38ac3: am 4c3133a2: am cb326240: Merge "Correctly handle launch animations for affordances" into lmp-mr1-dev

* commit '46f38ac3':
  Correctly handle launch animations for affordances
parents 52b33281 46f38ac3

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

+1 −12
Original line number Diff line number Diff line
@@ -3123,18 +3123,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
    protected void dismissKeyguardThenExecute(final OnDismissAction action,

            boolean afterKeyguardGone) {

        if (mStatusBarKeyguardViewManager.isShowing()) {

            if (UnlockMethodCache.getInstance(mContext).isMethodInsecure()

                    && mNotificationPanel.isLaunchTransitionRunning() && !afterKeyguardGone) {

                action.onDismiss();

                mNotificationPanel.setLaunchTransitionEndRunnable(new Runnable() {

                    @Override

                    public void run() {

                        mStatusBarKeyguardViewManager.dismiss();

                    }

                });

            } else {

            mStatusBarKeyguardViewManager.dismissWithAction(action, afterKeyguardGone);

            }

        } else {

            action.onDismiss();

        }