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

Commit cdb9c781 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 am: 2ff3b2a1 

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



Change-Id: I0ae6d79028a746c7d0e30a2298f6ad8b69d9e2e3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5ad58245 2ff3b2a1

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