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

Commit 7126b7b7 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Reparent task back to the surface control during change... 

Merge "Merge "Reparent task back to the surface control during change transitions" into udc-dev am: 545899f8" into udc-dev-plus-aosp am: 6fbb5b23

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



Change-Id: I686718e033751ff1f2ae6ef60c284c87cf5bb9f1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 49a8ab2d 6fbb5b23

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

+4 −0
Original line number Diff line number Diff line
@@ -82,6 +82,10 @@ public class TaskViewTaskController implements ShellTaskOrganizer.TaskListener { 
        mGuard.open("release");

    }



    SurfaceControl getSurfaceControl() {

        return mSurfaceControl;

    }



    /**

     * Sets the provided {@link TaskViewBase}, which is used to notify the client part about the

     * task related changes and getting the current bounds.

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

+13 −0
Original line number Diff line number Diff line
@@ -336,6 +336,19 @@ public class TaskViewTransitions implements Transitions.TransitionHandler { 
                tv.prepareOpenAnimation(taskIsNew, startTransaction, finishTransaction,

                        chg.getTaskInfo(), chg.getLeash(), wct);

                changesHandled++;

            } else if (chg.getMode() == TRANSIT_CHANGE) {

                TaskViewTaskController tv = findTaskView(chg.getTaskInfo());

                if (tv == null) {

                    if (pending != null) {

                        Slog.w(TAG, "Found a non-TaskView task in a TaskView Transition. This "

                                + "shouldn't happen, so there may be a visual artifact: "

                                + chg.getTaskInfo().taskId);

                    }

                    continue;

                }

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

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

                changesHandled++;

            }

        }

        if (stillNeedsMatchingLaunch) {