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

Commit 5f8e0b82 authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Do not run peek animation when keyguard is fading" into pi-dev am: 3e57c9f5 

am: bb3366a5

Change-Id: I1bc8281004fdbd6735930cc8e3b3059fb778fd01
parents 436f2235 bb3366a5

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

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

            }

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

                && !mStatusBar.isBouncerShowing()) {

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

            long timePassed = SystemClock.uptimeMillis() - mDownTime;

            if (timePassed < ViewConfiguration.getLongPressTimeout()) {

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