From 52dd2fa170baac1231b01c7344e0d52e5298ea55 Mon Sep 17 00:00:00 2001 From: "jorgegil@google.com" Date: Tue, 16 Feb 2021 11:05:15 -0800 Subject: [PATCH] Align PIP menu after rotation Moves the menu and updates its bounds to the post-rotation bounds. Bug: 173252147 Test: enter Pip, tap to show menu, rotate - verify menu moves with the Pip window Change-Id: I19f33d256be6d6d7612cdfafcf0cae9c3620cb25 --- .../Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java | 4 ++-- .../src/com/android/wm/shell/pip/phone/PipController.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) 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 3064af6f51700..c8c862e79f070 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 @@ -66,7 +66,6 @@ import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.common.DisplayController; import com.android.wm.shell.common.ShellExecutor; import com.android.wm.shell.common.annotations.ShellMainThread; -import com.android.wm.shell.legacysplitscreen.LegacySplitScreen; import com.android.wm.shell.legacysplitscreen.LegacySplitScreenController; import com.android.wm.shell.pip.phone.PipMotionHelper; import com.android.wm.shell.transition.Transitions; @@ -973,7 +972,8 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, finishResizeForMenu(destinationBounds); } - private void finishResizeForMenu(Rect destinationBounds) { + /** Moves the PiP menu to the destination bounds. */ + public void finishResizeForMenu(Rect destinationBounds) { mPipMenuController.movePipMenu(null, null, destinationBounds); mPipMenuController.updateMenuBounds(destinationBounds); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java index c3970e33d736d..4a2a032d8d1c0 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java @@ -552,6 +552,7 @@ public class PipController implements PipTransitionController.PipTransitionCallb // mTouchHandler would rely on the bounds populated from mPipTaskOrganizer mPipTaskOrganizer.onMovementBoundsChanged(outBounds, fromRotation, fromImeAdjustment, fromShelfAdjustment, wct); + mPipTaskOrganizer.finishResizeForMenu(outBounds); mTouchHandler.onMovementBoundsChanged(mTmpInsetBounds, mPipBoundsState.getNormalBounds(), outBounds, fromImeAdjustment, fromShelfAdjustment, rotation); }