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

Commit d4ef78bb authored by Justin Weir's avatar Justin Weir Committed by Android (Google) Code Review
Browse files

Merge "Fix shade collapse on keyguard with bypass enabled"

parents f2eba4ed ecc539a2

packages/SystemUI/src/com/android/systemui/shade/PanelViewController.java

+2 −4
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ public abstract class PanelViewController { 
        mInitialOffsetOnTouch = expandedHeight;

        mInitialExpandY = newY;

        mInitialExpandX = newX;

        mInitialTouchFromKeyguard = mStatusBarStateController.getState() == StatusBarState.KEYGUARD;

        mInitialTouchFromKeyguard = mKeyguardStateController.isShowing();

        if (startTracking) {

            mTouchSlopExceeded = true;

            setExpandedHeight(mInitialOffsetOnTouch);
@@ -416,9 +416,7 @@ public abstract class PanelViewController { 
            float vectorVel = (float) Math.hypot(

                    mVelocityTracker.getXVelocity(), mVelocityTracker.getYVelocity());



            final boolean onKeyguard =

                    mStatusBarStateController.getState() == StatusBarState.KEYGUARD;



            final boolean onKeyguard = mKeyguardStateController.isShowing();

            final boolean expand;

            if (mKeyguardStateController.isKeyguardFadingAway()

                    || (mInitialTouchFromKeyguard && !onKeyguard)) {