| commit | d2c77bda3105b87997682aaf111643caa145f320 | [log] [tgz] |
|---|---|---|
| author | Mateusz Cicheński <mateuszc@google.com> | Tue Apr 18 17:47:12 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 18 17:47:12 2023 +0000 |
| tree | 6a21c318eb37fd344c1d6b2e3d1f7b80da5b41fd | |
| parent | cc21a474e3043587fe045b7cf6b4dce16ac5196c [diff] | |
| parent | c470c58e6d4798415ab1f71e95aeb37cd7ed4139 [diff] |
Merge "Reset pinch gesture on apps without seamless resize" into udc-dev am: c470c58e6d Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22622784 Change-Id: Ie867958397d930c4660fd985dad13855a18d7e24 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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);