Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix surface crop being wrong after rotation" into udc-dev am: 974c3d9558

Browse Source 
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>
This commit is contained in:
Mady Mellor
2023-05-10 00:12:54 +00:00
committed by Automerger Merge Worker
parent be9ccf4cf6 974c3d9558
commit 2ff3b2a1db
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libs/WindowManager/Shell/src/com/android/wm/shell/taskview/TaskViewTaskController.java
View File

@@ -501,11 +501,14 @@ public class TaskViewTaskController implements ShellTaskOrganizer.TaskListener {
.show(mTaskLeash); .show(mTaskLeash);
// Also reparent on finishTransaction since the finishTransaction will reparent back // Also reparent on finishTransaction since the finishTransaction will reparent back
// to its "original" parent by default. // to its "original" parent by default.
Rect boundsOnScreen = mTaskViewBase.getCurrentBoundsOnScreen();
finishTransaction.reparent(mTaskLeash, mSurfaceControl) finishTransaction.reparent(mTaskLeash, mSurfaceControl)
.setPosition(mTaskLeash, 0, 0); .setPosition(mTaskLeash, 0, 0)
mTaskViewTransitions.updateBoundsState(this, mTaskViewBase.getCurrentBoundsOnScreen()); // 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 */); mTaskViewTransitions.updateVisibilityState(this, true /* visible */);
wct.setBounds(mTaskToken, mTaskViewBase.getCurrentBoundsOnScreen()); wct.setBounds(mTaskToken, boundsOnScreen);
} else { } else {
// The surface has already been destroyed before the task has appeared, // The surface has already been destroyed before the task has appeared,
// so go ahead and hide the task entirely // so go ahead and hide the task entirely