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

Commit 36fd4ec7 authored by Gaurav Bhola's avatar Gaurav Bhola Committed by Android (Google) Code Review
Browse files

Merge "When checking for isTaskView(), account for children."

parents fc15fd31 d48c4846
Loading
Loading
Loading
Loading
+11 −2
Original line number Diff line number Diff line
@@ -901,9 +901,18 @@ public class AppTransitionController {
     * TODO(b/213312721): Remove this predicate and its callers once ShellTransition is enabled.
     */
    static boolean isTaskViewTask(WindowContainer wc) {
        // We use Task#mRemoveWithTaskOrganizer to identify an embedded Task, but this is a hack and
        // Use Task#mRemoveWithTaskOrganizer to identify an embedded Task, but this is a hack and
        // it is not guaranteed to work this logic in the future version.
        return wc instanceof Task && ((Task) wc).mRemoveWithTaskOrganizer;
        boolean isTaskViewTask =  wc instanceof Task && ((Task) wc).mRemoveWithTaskOrganizer;
        if (isTaskViewTask) {
            return true;
        }

        WindowContainer parent = wc.getParent();
        boolean isParentATaskViewTask = parent != null
                && parent instanceof Task
                && ((Task) parent).mRemoveWithTaskOrganizer;
        return isParentATaskViewTask;
    }

    /**