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

Merge "PiP: Do nothing when tapping on resize drag handle." into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-06-05 23:33:24 +00:00
committed by Android (Google) Code Review
parent d29532e699 f8c274c9d8
commit 96a8a29877
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
packages/SystemUI/src/com/android/systemui/pip/phone/PipResizeGestureHandler.java
View File

@@ -292,20 +292,29 @@ public class PipResizeGestureHandler {
break;
case MotionEvent.ACTION_UP:
case MotionEvent.ACTION_CANCEL:
mPipTaskOrganizer.scheduleFinishResizePip(mLastResizeBounds, (Rect bounds) -> {
new Handler(Looper.getMainLooper()).post(() -> {
mMotionHelper.synchronizePinnedStackBounds();
mUpdateMovementBoundsRunnable.run();
mCtrlType = CTRL_NONE;
mAllowGesture = false;
mThresholdCrossed = false;
});
});
if (!mLastResizeBounds.isEmpty()) {
mPipTaskOrganizer.scheduleFinishResizePip(mLastResizeBounds,
(Rect bounds) -> {
new Handler(Looper.getMainLooper()).post(() -> {
mMotionHelper.synchronizePinnedStackBounds();
mUpdateMovementBoundsRunnable.run();
resetState();
});
});
} else {
resetState();
}
break;
}
}
}
private void resetState() {
mCtrlType = CTRL_NONE;
mAllowGesture = false;
mThresholdCrossed = false;
}
void updateMaxSize(int maxX, int maxY) {
mMaxSize.set(maxX, maxY);
}

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

@@ -606,11 +606,9 @@ public class PipTouchHandler {
MotionEvent ev = (MotionEvent) inputEvent;
if (mPipResizeGestureHandler.isWithinTouchRegion((int) ev.getX(), (int) ev.getY())) {
if (mPipResizeGestureHandler.isWithinTouchRegion((int) ev.getRawX(), (int) ev.getRawY())) {
return true;
}
if (mMagnetizedPip.maybeConsumeMotionEvent(ev)) {
// If the first touch event occurs within the magnetic field, pass the ACTION_DOWN event
// to the touch state. Touch state needs a DOWN event in order to later process MOVE