| commit | 3f6a430c2061bc1eb86962ce6249abaa5b38da12 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Nov 10 09:52:15 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 10 09:52:15 2021 +0000 |
| tree | b99a95b4081a16a7b4fbeeb300b0a9222dce068f | |
| parent | c7e9e637bc700f1c72f6d1199294434a572e7099 [diff] | |
| parent | e4f6f951da92f63c73a2d00366f6bcb65669ea04 [diff] |
Merge "Don't skip adding stub home task if applyLoadPlan hasn't run" into sc-v2-dev am: e4f6f951da Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16221737 Change-Id: Id43dc63c7799e1ebedecac7f524e4b66a6772546
diff --git a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java index 48315d0..15a5c3e 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);
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() {