summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Merissa Mitchell <liyingtan@google.com> 2025-02-25 14:44:06 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2025-02-25 14:44:06 -0800
commitd1dc84002e7e77fdda667da691b85d53d44da82f (patch)
tree51b792063d9f10a62edb961dee4cb1f5e9bff141
parentd487534e9a0ffa1c7d567bf1a47a2daac91210d4 (diff)
parent903c5de5dfde399c5887b34880030663a6f6f416 (diff)
Merge "[PiP on Desktop] Fix drag getting triggered on dismiss button." into main
-rw-r--r--libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipResizeGestureHandler.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipResizeGestureHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipResizeGestureHandler.java
index b869bf153c34..af1e98a3a8d2 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipResizeGestureHandler.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipResizeGestureHandler.java
@@ -395,6 +395,7 @@ public class PipResizeGestureHandler implements
void finishResize() {
if (mLastResizeBounds.isEmpty()) {
resetState();
+ return;
}
// Cache initial bounds after release for animation before mLastResizeBounds are modified.