Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d2e32ed authored by Mady Mellor's avatar Mady Mellor Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23091738



Change-Id: Ib5afdd3fe0b1d4eab805f7f998756aafc671ecf9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7a16fc8a 974c3d95

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

+6 −3
Original line number Diff line number Diff line
@@ -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