Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Ensure movement bounds for shift account for current bounds" into rvc-dev

Browse Source
This commit is contained in:
Winson Chung
2020-06-18 17:28:06 +00:00
committed by Android (Google) Code Review
parent 058a713a74 66215994e8
commit 8ffd77a278
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -467,9 +467,9 @@ public class PipTouchHandler {
// touching the screen // touching the screen
} else { } else {
final boolean isExpanded = mMenuState == MENU_STATE_FULL && willResizeMenu(); final boolean isExpanded = mMenuState == MENU_STATE_FULL && willResizeMenu();
final Rect toMovementBounds = isExpanded final Rect toMovementBounds = new Rect();
? new Rect(expandedMovementBounds) mSnapAlgorithm.getMovementBounds(curBounds, insetBounds,
: new Rect(normalMovementBounds); toMovementBounds, mIsImeShowing ? mImeHeight : 0);
final int prevBottom = mMovementBounds.bottom - mMovementBoundsExtraOffsets; final int prevBottom = mMovementBounds.bottom - mMovementBoundsExtraOffsets;
final int toBottom = toMovementBounds.bottom < toMovementBounds.top final int toBottom = toMovementBounds.bottom < toMovementBounds.top
? toMovementBounds.bottom ? toMovementBounds.bottom
@@ -1039,6 +1039,7 @@ public class PipTouchHandler {
pw.println(innerPrefix + "mShelfHeight=" + mShelfHeight); pw.println(innerPrefix + "mShelfHeight=" + mShelfHeight);
pw.println(innerPrefix + "mSavedSnapFraction=" + mSavedSnapFraction); pw.println(innerPrefix + "mSavedSnapFraction=" + mSavedSnapFraction);
pw.println(innerPrefix + "mEnableDragToEdgeDismiss=" + mEnableDismissDragToEdge); pw.println(innerPrefix + "mEnableDragToEdgeDismiss=" + mEnableDismissDragToEdge);
pw.println(innerPrefix + "mMovementBoundsExtraOffsets=" + mMovementBoundsExtraOffsets);
mTouchState.dump(pw, innerPrefix); mTouchState.dump(pw, innerPrefix);
mMotionHelper.dump(pw, innerPrefix); mMotionHelper.dump(pw, innerPrefix);
} }

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

@@ -31,7 +31,7 @@ import java.io.PrintWriter;
* This keeps track of the touch state throughout the current touch gesture. * This keeps track of the touch state throughout the current touch gesture.
*/ */
public class PipTouchState { public class PipTouchState {
private static final String TAG = "PipTouchHandler"; private static final String TAG = "PipTouchState";
private static final boolean DEBUG = false; private static final boolean DEBUG = false;
@VisibleForTesting @VisibleForTesting