diff options
| author | 2022-11-02 17:36:37 +0000 | |
|---|---|---|
| committer | 2022-11-02 17:36:37 +0000 | |
| commit | d04f92f27d5fe65bad73f2a3d4dbbc48388fa294 (patch) | |
| tree | 06ea5f9b531f436fa7a6018146e34f77bf07e3e9 | |
| parent | b3da8bf51a2bcaa77f1b95882e203015a0d8097f (diff) | |
| parent | 6af502fdb8e802f735661576decedec118979229 (diff) | |
Merge "Skip moving PiP for IME/shelf change if user is dragging." into tm-qpr-dev
| -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) { |