Merge "Ensure movement bounds for shift account for current bounds" into rvc-dev (8ffd77a2) · Commits · e / os / android_frameworks_base

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);
		}

+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