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

Commit 0cdc1c79 authored by Matt Pietal's avatar Matt Pietal Committed by Android (Google) Code Review
Browse files

Merge "Fix shade collapse on keyguard with bypass enabled" into tm-qpr-dev

parents 40db12e7 6b80f7c4

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)) {