From 50b0245f8c01a5c3ac17c09f9c64193170273189 Mon Sep 17 00:00:00 2001
From: Ikram Gabiyev <gabiyev@google.com>
Date: Thu, 21 Nov 2024 16:20:33 -0800
Subject: [PiP2] Update magnetized target on config change

We need to make sure dismiss and magnetized target
are properly updated on configuration changes.
Otherwise, any display changes for instance lead to
incorrect magnetized target location.

Bug: 380336325
Flag: com.android.wm.shell.enable_pip2
Test: enter PiP w/ fixed-rotation and drag-to-dismiss
Test: enter PiP, fold/unfold, then drag-to-dismiss
Change-Id: I8cfe243d82392425fb8b3b2e6da20bd3d8f111cd
---
 .../Shell/src/com/android/wm/shell/pip2/phone/PipController.java      | 1 +
 .../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) {
-- 
cgit v1.2.3-59-g8ed1b