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

Commit cd35372a authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Potential fix for end callback not being run in 3-button" into udc-dev am: 606c4bfc 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23019205



Change-Id: Id5ce0f3686459dcd7ed59e268d37d75ddc0d28de
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 92a1887a 606c4bfc

quickstep/src/com/android/quickstep/views/TaskView.java

+9 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ import com.android.launcher3.util.ViewPool.Reusable; 
import com.android.quickstep.RecentsModel;

import com.android.quickstep.RemoteAnimationTargets;

import com.android.quickstep.RemoteTargetGluer.RemoteTargetHandle;

import com.android.quickstep.TaskAnimationManager;

import com.android.quickstep.TaskIconCache;

import com.android.quickstep.TaskOverlayFactory;

import com.android.quickstep.TaskThumbnailCache;
@@ -802,6 +803,14 @@ public class TaskView extends FrameLayout implements Reusable { 
                    recentsView.addSideTaskLaunchCallback(callbackList);

                    return callbackList;

                }

                if (TaskAnimationManager.ENABLE_SHELL_TRANSITIONS) {

                    // If the recents transition is running (ie. in live tile mode), then the start

                    // of a new task will merge into the existing transition and it currently will

                    // not be run independently, so we need to rely on the onTaskAppeared() call

                    // for the new task to trigger the side launch callback to flush this runnable

                    // list (which is usually flushed when the app launch animation finishes)

                    recentsView.addSideTaskLaunchCallback(opts.onEndCallback);

                }

                return opts.onEndCallback;

            } else {

                notifyTaskLaunchFailed(TAG);