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

Commit a26c3d99 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 8b794e6a ed56528c

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