diff options
| author | 2022-11-02 17:38:33 +0000 | |
|---|---|---|
| committer | 2022-11-02 17:38:33 +0000 | |
| commit | 2d4b3f6d557bd17ec59e4804bc87958aa4d7a4f7 (patch) | |
| tree | 81b2605d71962db774aacf71f06060de9d1807e9 | |
| parent | 1be4c479904c7567884f9a9a41b5e2a6ecd1c48b (diff) | |
| parent | d04f92f27d5fe65bad73f2a3d4dbbc48388fa294 (diff) | |
Merge "Skip moving PiP for IME/shelf change if user is dragging." into tm-qpr-dev am: d04f92f27d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20291084
Change-Id: Ia8148ff598218451c344d6a82793f47c6be8e536
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipTouchHandler.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipTouchHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipTouchHandler.java index 975d4bba276e..a9a97beb9180 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipTouchHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipTouchHandler.java @@ -427,7 +427,7 @@ public class PipTouchHandler { // If this is from an IME or shelf adjustment, then we should move the PiP so that it is not // occluded by the IME or shelf. if (fromImeAdjustment || fromShelfAdjustment) { - if (mTouchState.isUserInteracting()) { + if (mTouchState.isUserInteracting() && mTouchState.isDragging()) { // Defer the update of the current movement bounds until after the user finishes // touching the screen } else if (ENABLE_PIP_KEEP_CLEAR_ALGORITHM) { |