Merge "Fix notification dot not always being up to date." into sc-dev am: 8e095ccb05 am: 70e8c0b022

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

Change-Id: If3bee71b46586a6b26bc030e87166fdb3788e440

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

@@ -96,6 +96,13 @@ public class PredictionRowView extends LinearLayout implements
 
     private void updateVisibility() {
         setVisibility(mPredictionsEnabled ? VISIBLE : GONE);
+        if (mLauncher.getAppsView() != null) {
+            if (mPredictionsEnabled) {
+                mLauncher.getAppsView().getAppsStore().registerIconContainer(this);
+            } else {
+                mLauncher.getAppsView().getAppsStore().unregisterIconContainer(this);
+            }
+        }
     }
 
     @Override

src/com/android/launcher3/allapps/AllAppsStore.java

@@ -132,7 +132,7 @@ public class AllAppsStore {
     }
 
     public void registerIconContainer(ViewGroup container) {
-        if (container != null) {
+        if (container != null && !mIconContainers.contains(container)) {
             mIconContainers.add(container);
         }
     }

src/com/android/launcher3/views/FloatingIconView.java

@@ -580,11 +580,6 @@ public class FloatingIconView extends FrameLayout implements
                     if (originalView instanceof IconLabelDotView) {
                         setIconAndDotVisible(originalView, true);
                     }
-                    if (originalView instanceof BubbleTextView) {
-                        BubbleTextView btv = (BubbleTextView) originalView;
-                        btv.setIconVisible(true);
-                        btv.setForceHideDot(true);
-                    }
                     view.finish(dragLayer);
                 }
             } else {