diff options
| author | 2024-11-22 16:40:13 +0000 | |
|---|---|---|
| committer | 2024-11-22 16:40:13 +0000 | |
| commit | ca649f050adca02daf1b8342bbd456c8a9fa4cbd (patch) | |
| tree | b911e2a24e803dc93ce4e705a180216571480249 | |
| parent | 8063837bf47cd37ea4eb241f6836ab6cc37d456d (diff) | |
| parent | 50b0245f8c01a5c3ac17c09f9c64193170273189 (diff) | |
Merge "[PiP2] Update magnetized target on config change" into main
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipController.java | 1 | ||||
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTouchHandler.java | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipController.java index 6d2df952ee58..2c5d346224a3 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipController.java @@ -254,6 +254,7 @@ public class PipController implements ConfigurationChangeListener, @Override public void onConfigurationChanged(Configuration newConfiguration) { mPipDisplayLayoutState.onConfigurationChanged(); + mPipTouchHandler.onConfigurationChanged(); } @Override diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTouchHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTouchHandler.java index 65972fb7df48..44cc563eadf4 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTouchHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTouchHandler.java @@ -363,12 +363,10 @@ public class PipTouchHandler implements PipTransitionState.PipTransitionStateCha mMotionHelper.synchronizePinnedStackBounds(); reloadResources(); - /* - if (mPipTaskOrganizer.isInPip()) { + if (mPipTransitionState.isInPip()) { // Recreate the dismiss target for the new orientation. mPipDismissTargetHandler.createOrUpdateDismissTarget(); } - */ } void onImeVisibilityChanged(boolean imeVisible, int imeHeight) { |