commit 2727434c44d06882925369bf4b43687a06be4a3f
author Schneider Victor-tulias <victortulias@google.com> Fri Oct 09 20:09:08 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 09 20:09:08 2020 +0000
tree 7579978e9f4d9d0838a95548faa97d98e25ec748
parent 59f532fe9e2b1817c094641f3c7c517f42e4faf0
parent 1b9e199b3d9c81c793758d96bb03e0c51c1b3fb1

Merge "Fix hotseat and prediction row to allow updates when empty." into ub-launcher3-master

quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java

diff --git a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
index 37336d1..f313d75 100644
--- a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
+++ b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
@@ -206,7 +206,7 @@
      * we can optimize by swapping them in place.
      */
     public void setPredictedApps(List<ItemInfo> items) {
-        if (isShown() && getWindowVisibility() == View.VISIBLE) {
+        if (!mLauncher.isWorkspaceLoading() && isShown() && getWindowVisibility() == View.VISIBLE) {
             mPendingPredictedItems = items;
             return;
         }

quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java

diff --git a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
index 76bab59..d3b7e22 100644
--- a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
+++ b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
@@ -251,7 +251,9 @@
      * Sets or updates the predicted items
      */
     public void setPredictedItems(FixedContainerItems items) {
-        if (mHotseat.isShown() && mHotseat.getWindowVisibility() == View.VISIBLE) {
+        if (!mLauncher.isWorkspaceLoading()
+                && mHotseat.isShown()
+                && mHotseat.getWindowVisibility() == View.VISIBLE) {
             mHotseat.setOnVisibilityAggregatedCallback((isVisible) -> {
                 if (isVisible) {
                     return;