Merge "Schedule OverviewCommandHelper callbacks for GroupedTaskView" into sc-v2-dev am: f7518d42eb

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16346762 Change-Id: I43fd2aa6994d99dca448116c2dd22ccf66b98e2f
2021-12-01 06:49:57 +00:00
parent b3f069e06c f7518d42eb
commit 89fe31ef0e
1 changed files with 13 additions and 3 deletions
@@ -157,10 +157,20 @@ public class GroupedTaskView extends TaskView {
    @Nullable
    @Override
    public RunnableList launchTaskAnimated() {
-        getRecentsView().getSplitPlaceholder().launchTasks(this /*groupedTaskView*/,
-                null /*callback*/,
+        if (mTask == null || mSecondaryTask == null) {
+            return null;
+        }
+
+        RunnableList endCallback = new RunnableList();
+        RecentsView recentsView = getRecentsView();
+        // Callbacks run from remote animation when recents animation not currently running
+        recentsView.getSplitPlaceholder().launchTasks(this /*groupedTaskView*/,
+                success -> endCallback.executeAllAndDestroy(),
                false /* freezeTaskList */);
-        return null;
+
+        // Callbacks get run from recentsView for case when recents animation already running
+        recentsView.addSideTaskLaunchCallback(endCallback);
+        return endCallback;
    }

    @Override