| commit | 1032f3cd642803f92da1768c406880755c5f8abc | [log] [tgz] |
|---|---|---|
| author | Jonathan Miranda <jonmiranda@google.com> | Mon Jul 19 17:59:29 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jul 19 17:59:29 2021 +0000 |
| tree | eaa12cec40c27abc919e6d2bed0d5c0ca451df03 | |
| parent | 176800394dee763f8da7cbdb5d80ea3b33974cd4 [diff] | |
| parent | 8e095ccb0577727bb18ad06a02a0662ca5564419 [diff] |
Merge "Fix notification dot not always being up to date." into sc-dev am: 8e095ccb05 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15302020 Change-Id: I14464148a1f19023f937eb2449bcb3dac1493638
diff --git a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java index de04082..6afbf9a 100644 --- a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java +++ b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
@@ -96,6 +96,13 @@ 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
diff --git a/src/com/android/launcher3/allapps/AllAppsStore.java b/src/com/android/launcher3/allapps/AllAppsStore.java index 2443b83..7bc3eec 100644 --- a/src/com/android/launcher3/allapps/AllAppsStore.java +++ b/src/com/android/launcher3/allapps/AllAppsStore.java
@@ -132,7 +132,7 @@ } public void registerIconContainer(ViewGroup container) { - if (container != null) { + if (container != null && !mIconContainers.contains(container)) { mIconContainers.add(container); } }
diff --git a/src/com/android/launcher3/views/FloatingIconView.java b/src/com/android/launcher3/views/FloatingIconView.java index 3027db6..872adec 100644 --- a/src/com/android/launcher3/views/FloatingIconView.java +++ b/src/com/android/launcher3/views/FloatingIconView.java
@@ -580,11 +580,6 @@ 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 {