commit c470c58e6d4798415ab1f71e95aeb37cd7ed4139
author Mateusz Cicheński <mateuszc@google.com> Tue Apr 18 17:21:49 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 18 17:21:49 2023 +0000
tree 4dd95d9c21153ae5dc3a5eb76c626099fdd6d7cc
parent 0ecccdd14ca84b9ff81333d02c12e0a87a4e4e94
parent 6f0335316b9a1fd30a3ce4e9ed3729b810449f39

Merge "Reset pinch gesture on apps without seamless resize" into udc-dev

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java
index c8062bc..b6216b3 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java
@@ -1532,6 +1532,9 @@
             if (snapshotSurface != null) {
                 mSyncTransactionQueue.queue(wct);
                 mSyncTransactionQueue.runInSync(t -> {
+                    // reset the pinch gesture
+                    maybePerformFinishResizeCallback();
+
                     // Scale the snapshot from its pre-resize bounds to the post-resize bounds.
                     mSurfaceTransactionHelper.scale(t, snapshotSurface, preResizeBounds,
                             snapshotDest);