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

Commit a1840056 authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

Merge "Fix shade collapse on keyguard with bypass enabled" into tm-d1-dev am: d1d5f8da 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19675492



Change-Id: I0500bd02dbeb7ddae85002fddf0880bfa2366c23
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a8332428 d1d5f8da

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

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

        mInitialTouchY = newY;

        mInitialTouchX = newX;

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

        mInitialTouchFromKeyguard = mKeyguardStateController.isShowing();

        if (startTracking) {

            mTouchSlopExceeded = true;

            setExpandedHeight(mInitialOffsetOnTouch);
@@ -414,9 +414,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)) {