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

Commit 3e57c9f5 authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

Merge "Do not run peek animation when keyguard is fading" into pi-dev

parents 7ee86d1d ec46f384

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -488,7 +488,7 @@ public abstract class PanelView extends FrameLayout { 
                mUpdateFlingVelocity = vel;

                mUpdateFlingVelocity = vel;

            }

            }

        } else if (mPanelClosedOnDown && !mHeadsUpManager.hasPinnedHeadsUp() && !mTracking

        } else if (mPanelClosedOnDown && !mHeadsUpManager.hasPinnedHeadsUp() && !mTracking

                && !mStatusBar.isBouncerShowing()) {

                && !mStatusBar.isBouncerShowing() && !mStatusBar.isKeyguardFadingAway()) {

            long timePassed = SystemClock.uptimeMillis() - mDownTime;

            long timePassed = SystemClock.uptimeMillis() - mDownTime;

            if (timePassed < ViewConfiguration.getLongPressTimeout()) {

            if (timePassed < ViewConfiguration.getLongPressTimeout()) {

                // Lets show the user that he can actually expand the panel

                // Lets show the user that he can actually expand the panel