Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e16c6ed authored by Jonathan Miranda's avatar Jonathan Miranda Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I02076f77ffcae6bfb49e0bac3c79b0e0b87d5656
parents 3c4a959f 8e095ccb

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

+7 −0
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+0 −5
Original line number Diff line number Diff line
@@ -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 {