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

Commit e96e39cf authored by Johannes Gallmann's avatar Johannes Gallmann
Browse files

Fix notification shade not expanding from right side after unfold 

The width of mKeyguardStatusBar is not adjusted when unfolding. It is only adjusted once the shade gets expanded the first time. Therefore we need to query the window width and use that instead for the back bypass check.

Bug: 309628369
Flag: LEGACY WM_SHADE_ANIMATE_BACK_GESTURE DISABLED
Test: Manual, i.e. testing shade expansion behaviour after unfolding
Change-Id: I4c8453fb6bd2357f9c975435e0806b33a8375164
parent a891bc20

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

+12 −1
Original line number Diff line number Diff line
@@ -260,6 +260,14 @@ public class QuickSettingsController implements Dumpable { 
     */

    private Insets mCachedGestureInsets;



    /**

     * The window width currently in effect -- used together with

     * {@link QuickSettingsController#mCachedGestureInsets} to decide whether a back gesture should

     * receive a horizontal swipe inwards from the left/right vertical edge of the screen.

     * We cache this on ACTION_DOWN, and query it during both ACTION_DOWN and ACTION_MOVE events.

     */

    private int mCachedWindowWidth;



    /**

     * The amount of progress we are currently in if we're transitioning to the full shade.

     * 0.0f means we're not transitioning yet, while 1 means we're all the way in the full
@@ -544,6 +552,7 @@ public class QuickSettingsController implements Dumpable { 
        WindowMetrics windowMetrics = wm.getCurrentWindowMetrics();

        mCachedGestureInsets = windowMetrics.getWindowInsets().getInsets(

                WindowInsets.Type.systemGestures());

        mCachedWindowWidth = windowMetrics.getBounds().width();

    }



    /**
@@ -552,7 +561,7 @@ public class QuickSettingsController implements Dumpable { 
     */

    public boolean shouldBackBypassQuickSettings(float touchX) {

        return (touchX < mCachedGestureInsets.left)

                || (touchX > mKeyguardStatusBar.getWidth() - mCachedGestureInsets.right);

                || (touchX > mCachedWindowWidth - mCachedGestureInsets.right);

    }



    /** Returns whether touch is within QS area */
@@ -2121,6 +2130,8 @@ public class QuickSettingsController implements Dumpable { 
        ipw.println(mAnimatorExpand);

        ipw.print("mCachedGestureInsets=");

        ipw.println(mCachedGestureInsets);

        ipw.print("mCachedWindowWidth=");

        ipw.println(mCachedWindowWidth);

        ipw.print("mTransitioningToFullShadeProgress=");

        ipw.println(mTransitioningToFullShadeProgress);

        ipw.print("mDistanceForFullShadeTransition=");