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

Commit 3f6a430c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't skip adding stub home task if applyLoadPlan hasn't run" into sc-v2-dev am: e4f6f951 

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

Change-Id: Id43dc63c7799e1ebedecac7f524e4b66a6772546
parents c7e9e637 e4f6f951

quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java

+2 −1
Original line number Diff line number Diff line
@@ -145,9 +145,10 @@ public class FallbackRecentsView extends RecentsView<RecentsActivity, RecentsSta 
        RunningTaskInfo runningTaskInfo = runningTaskInfos[0];

        if (mHomeTaskInfo != null && runningTaskInfo != null &&

                mHomeTaskInfo.taskId == runningTaskInfo.taskId

                && getTaskViewCount() == 0) {

                && getTaskViewCount() == 0 && mLoadPlanEverApplied) {

            // Do not add a stub task if we are running over home with empty recents, so that we

            // show the empty recents message instead of showing a stub task and later removing it.

            // Ignore empty task signal if applyLoadPlan has never run.

            return false;

        }

        return super.shouldAddStubTaskView(runningTaskInfos);

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

+2 −0
Original line number Diff line number Diff line
@@ -573,6 +573,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 


    // Keeps track of task id whose visual state should not be reset

    private int mIgnoreResetTaskId = -1;

    protected boolean mLoadPlanEverApplied;



    // Variables for empty state

    private final Drawable mEmptyIcon;
@@ -1451,6 +1452,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
        resetTaskVisuals();

        onTaskStackUpdated();

        updateEnabledOverlays();

        mLoadPlanEverApplied = true;

    }



    private boolean isModal() {