diff options
| author | 2023-05-10 00:12:54 +0000 | |
|---|---|---|
| committer | 2023-05-10 00:12:54 +0000 | |
| commit | 2ff3b2a1db9045ff441e892664f2a645915f852d (patch) | |
| tree | efa40711af56c8f6e65c36635769883ce4fdf86a | |
| parent | be9ccf4cf6ddecd6517be553c94c881c8feede96 (diff) | |
| parent | 974c3d95584c1722cbc3289c5c3a8ed9c44394c9 (diff) | |
Merge "Fix surface crop being wrong after rotation" into udc-dev am: 974c3d9558
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23091738
Change-Id: Ice82405a9eef9d7850077d4b681d77579ec5b1aa
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/taskview/TaskViewTaskController.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/taskview/TaskViewTaskController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/taskview/TaskViewTaskController.java index 3d0f3fb12ac3..1bbd3679948b 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/taskview/TaskViewTaskController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/taskview/TaskViewTaskController.java @@ -501,11 +501,14 @@ public class TaskViewTaskController implements ShellTaskOrganizer.TaskListener { .show(mTaskLeash); // Also reparent on finishTransaction since the finishTransaction will reparent back // to its "original" parent by default. + Rect boundsOnScreen = mTaskViewBase.getCurrentBoundsOnScreen(); finishTransaction.reparent(mTaskLeash, mSurfaceControl) - .setPosition(mTaskLeash, 0, 0); - mTaskViewTransitions.updateBoundsState(this, mTaskViewBase.getCurrentBoundsOnScreen()); + .setPosition(mTaskLeash, 0, 0) + // TODO: maybe once b/280900002 is fixed this will be unnecessary + .setWindowCrop(mTaskLeash, boundsOnScreen.width(), boundsOnScreen.height()); + mTaskViewTransitions.updateBoundsState(this, boundsOnScreen); mTaskViewTransitions.updateVisibilityState(this, true /* visible */); - wct.setBounds(mTaskToken, mTaskViewBase.getCurrentBoundsOnScreen()); + wct.setBounds(mTaskToken, boundsOnScreen); } else { // The surface has already been destroyed before the task has appeared, // so go ahead and hide the task entirely |