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

Commit c15b4185 authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "Don't prematurely apply finishT in taskview handler" into udc-dev am:... 

Merge "Don't prematurely apply finishT in taskview handler" into udc-dev am: 3d8774d2 am: ae9ca4b0

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



Change-Id: I2f18299bc32f234adbef723a921676d8f4ac0df2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0cf90d6a ae9ca4b0

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

+3 −5
Original line number Diff line number Diff line
@@ -453,7 +453,7 @@ public class TaskViewTaskController implements ShellTaskOrganizer.TaskListener { 
            return;

        }



        finishTransaction.reparent(mTaskLeash, null).apply();

        finishTransaction.reparent(mTaskLeash, null);



        if (mListener != null) {

            final int taskId = mTaskInfo.taskId;
@@ -490,13 +490,11 @@ public class TaskViewTaskController implements ShellTaskOrganizer.TaskListener { 
        if (mSurfaceCreated) {

            // Surface is ready, so just reparent the task to this surface control

            startTransaction.reparent(mTaskLeash, mSurfaceControl)

                    .show(mTaskLeash)

                    .apply();

                    .show(mTaskLeash);

            // Also reparent on finishTransaction since the finishTransaction will reparent back

            // to its "original" parent by default.

            finishTransaction.reparent(mTaskLeash, mSurfaceControl)

                    .setPosition(mTaskLeash, 0, 0)

                    .apply();

                    .setPosition(mTaskLeash, 0, 0);

            mTaskViewTransitions.updateBoundsState(this, mTaskViewBase.getCurrentBoundsOnScreen());

            mTaskViewTransitions.updateVisibilityState(this, true /* visible */);

            wct.setBounds(mTaskToken, mTaskViewBase.getCurrentBoundsOnScreen());

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

+2 −2
Original line number Diff line number Diff line
@@ -363,7 +363,8 @@ public class TaskViewTransitions implements Transitions.TransitionHandler { 
                    continue;

                }

                startTransaction.reparent(chg.getLeash(), tv.getSurfaceControl());

                finishTransaction.reparent(chg.getLeash(), tv.getSurfaceControl());

                finishTransaction.reparent(chg.getLeash(), tv.getSurfaceControl())

                    .setPosition(chg.getLeash(), 0, 0);

                changesHandled++;

            }

        }
@@ -377,7 +378,6 @@ public class TaskViewTransitions implements Transitions.TransitionHandler { 
        }

        // No animation, just show it immediately.

        startTransaction.apply();

        finishTransaction.apply();

        finishCallback.onTransitionFinished(wct, null /* wctCB */);

        startNextTransition();

        return true;