commit eecaf1f5aa24978a4d7187eb29b14c87e84b5b1a
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Nov 10 10:09:49 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Nov 10 10:09:49 2021 +0000
tree 55de41aa318a94b6b08cb63e8c2ff0c9e64e0e8c
parent ced6eeaaa165c041c8370fd82d73d300b5de6caf
parent d354341d30052584f44b64b291586f975f1f5096

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

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

Change-Id: I50ddb396c9e5545055553cbbd53637cbddec24b7

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

diff --git a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
index d90fab5..4044f7b 100644
--- a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
+++ b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
@@ -145,9 +145,10 @@
         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

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index a5534e7..9a76f2b 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -573,6 +573,7 @@
 
     // 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 @@
         resetTaskVisuals();
         onTaskStackUpdated();
         updateEnabledOverlays();
+        mLoadPlanEverApplied = true;
     }
 
     private boolean isModal() {