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

Commit 255bb6a8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Improve Task launch logging and function naming" into main

parents e08d6831 54fc5e0e

quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java

+1 −1
Original line number Diff line number Diff line
@@ -1431,7 +1431,7 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 
                                && !(foundTaskView instanceof DesktopTaskView)) {

                            TestLogging.recordEvent(

                                    TestProtocol.SEQUENCE_MAIN, "start: taskbarAppIcon");

                            foundTaskView.launchTasks();

                            foundTaskView.launchWithAnimation();

                            return;

                        }

                    }

quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java

+1 −1
Original line number Diff line number Diff line
@@ -610,7 +610,7 @@ public class QuickstepLauncher extends Launcher implements RecentsViewContainer, 
                                        .append(" is missing."),

                                QUICK_SWITCH_FROM_HOME_FALLBACK);

                    }

                    taskToLaunch.launchTask(success -> {

                    taskToLaunch.launchWithoutAnimation(success -> {

                        if (!success) {

                            getStateManager().goToState(OVERVIEW);

                        } else {

quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ public class OverviewState extends LauncherState { 
        TaskView taskView = recentsView.getRunningTaskView();

        if (taskView != null) {

            if (recentsView.isTaskViewFullyVisible(taskView)) {

                taskView.launchTasks();

                taskView.launchWithAnimation();

            } else {

                recentsView.snapToPage(recentsView.indexOfChild(taskView));

            }

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

+2 −2
Original line number Diff line number Diff line
@@ -2370,7 +2370,7 @@ public abstract class AbsSwipeUpHandler< 
                    ActiveGestureLog.INSTANCE.trackEvent(EXPECTING_TASK_APPEARED);

                }

                ActiveGestureLog.INSTANCE.addLog(nextTaskLog);

                nextTask.launchTask(success -> {

                nextTask.launchWithoutAnimation(true, success -> {

                    resultCallback.accept(success);

                    if (success) {

                        if (hasTaskPreviouslyAppeared) {
@@ -2383,7 +2383,7 @@ public abstract class AbsSwipeUpHandler< 
                        }

                    }

                    return Unit.INSTANCE;

                }, true /* freezeTaskList */);

                }  /* freezeTaskList */);

            } else {

                mContainerInterface.onLaunchTaskFailed();

                Toast.makeText(mContext, R.string.activity_not_available, LENGTH_SHORT).show();

quickstep/src/com/android/quickstep/OverviewCommandHelper.kt

+1 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ constructor( 
        if (taskView != null) {

            waitForToggleCommandComplete = true

            taskView.isEndQuickSwitchCuj = true

            callbackList = taskView.launchTasks()

            callbackList = taskView.launchWithAnimation()

        }



        if (callbackList != null) {