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

Commit 66215994 authored by Winson Chung's avatar Winson Chung
Browse files

Ensure movement bounds for shift account for current bounds 

Bug: 159250094
Test: Resize pip near the shelf offset area and change the shelf offset
Change-Id: I5ef13b1518a79b9f46a15ae448bd674ac1cb4d3c
parent 410ddb91

packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java

+4 −3
Original line number Diff line number Diff line
@@ -467,9 +467,9 @@ public class PipTouchHandler { 
                // touching the screen

            } else {

                final boolean isExpanded = mMenuState == MENU_STATE_FULL && willResizeMenu();

                final Rect toMovementBounds = isExpanded

                        ? new Rect(expandedMovementBounds)

                        : new Rect(normalMovementBounds);

                final Rect toMovementBounds = new Rect();

                mSnapAlgorithm.getMovementBounds(curBounds, insetBounds,

                        toMovementBounds, mIsImeShowing ? mImeHeight : 0);

                final int prevBottom = mMovementBounds.bottom - mMovementBoundsExtraOffsets;

                final int toBottom = toMovementBounds.bottom < toMovementBounds.top

                        ? toMovementBounds.bottom
@@ -1039,6 +1039,7 @@ public class PipTouchHandler { 
        pw.println(innerPrefix + "mShelfHeight=" + mShelfHeight);

        pw.println(innerPrefix + "mSavedSnapFraction=" + mSavedSnapFraction);

        pw.println(innerPrefix + "mEnableDragToEdgeDismiss=" + mEnableDismissDragToEdge);

        pw.println(innerPrefix + "mMovementBoundsExtraOffsets=" + mMovementBoundsExtraOffsets);

        mTouchState.dump(pw, innerPrefix);

        mMotionHelper.dump(pw, innerPrefix);

    }

packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchState.java

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ import java.io.PrintWriter; 
 * This keeps track of the touch state throughout the current touch gesture.

 */

public class PipTouchState {

    private static final String TAG = "PipTouchHandler";

    private static final String TAG = "PipTouchState";

    private static final boolean DEBUG = false;



    @VisibleForTesting