From 6f0335316b9a1fd30a3ce4e9ed3729b810449f39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Ciche=C5=84ski?= <mateuszc@google.com>
Date: Tue, 11 Apr 2023 04:53:20 +0000
Subject: [PATCH] Reset pinch gesture on apps without seamless resize

This callback is normally applied in the applyFinishBoundsResize, which
is not being used in case of apps not supporting seamless resize.

Bug: 277677631
Test: http://recall/-/ekEuGtt9d9HWqkUtAzpHx8/dGjKDuKG30t3JPTVsMbHwq
Test: manually, with ApiDemos and Maps - able to resize on every pinch
Change-Id: I347cdc9aee6e9b818e93b48d500427b01860d2af
---
 .../Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java   | 3 +++
 1 file changed, 3 insertions(+)

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 713ace6ee1c01..d4a50bfd90b55 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 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
             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);