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

Commit 57831180 authored by Mady Mellor's avatar Mady Mellor Committed by Automerger Merge Worker
Browse files

Merge "Fix duplicate bubbles in overflow" into rvc-dev am: 8a9020bb am:... 

Merge "Fix duplicate bubbles in overflow" into rvc-dev am: 8a9020bb am: 79006c58 am: d5c73bba am: e71f4ecc

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11821820

Change-Id: Ieab4562759a7c457dadf41fddb7ce49d1e5fe512
parents 6c619b67 e71f4ecc

packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java

+6 −6
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ import android.content.pm.ActivityInfo; 
import android.content.pm.PackageManager;

import android.content.res.Configuration;

import android.graphics.PixelFormat;

import android.graphics.Rect;

import android.os.Binder;

import android.os.Handler;

import android.os.RemoteException;
@@ -180,6 +179,9 @@ public class BubbleController implements ConfigurationController.ConfigurationLi 
    // Callback that updates BubbleOverflowActivity on data change.

    @Nullable private Runnable mOverflowCallback = null;



    // Only load overflow data from disk once

    private boolean mOverflowDataLoaded = false;



    private final NotificationInterruptStateProvider mNotificationInterruptStateProvider;

    private IStatusBarService mBarService;

    private WindowManager mWindowManager;
@@ -193,9 +195,6 @@ public class BubbleController implements ConfigurationController.ConfigurationLi 
    /** Whether or not the BubbleStackView has been added to the WindowManager. */

    private boolean mAddedToWindowManager = false;



    // Used for determining view rect for touch interaction

    private Rect mTempRect = new Rect();



    // Listens to user switch so bubbles can be saved and restored.

    private final NotificationLockscreenUserManager mNotifUserManager;
@@ -963,13 +962,14 @@ public class BubbleController implements ConfigurationController.ConfigurationLi 
     * Fills the overflow bubbles by loading them from disk.

     */

    void loadOverflowBubblesFromDisk() {

        if (!mBubbleData.getOverflowBubbles().isEmpty()) {

        if (!mBubbleData.getOverflowBubbles().isEmpty() || mOverflowDataLoaded) {

            // we don't need to load overflow bubbles from disk if it is already in memory

            return;

        }

        mOverflowDataLoaded = true;

        mDataRepository.loadBubbles((bubbles) -> {

            bubbles.forEach(bubble -> {

                if (mBubbleData.getBubbles().contains(bubble)) {

                if (mBubbleData.hasAnyBubbleWithKey(bubble.getKey())) {

                    // if the bubble is already active, there's no need to push it to overflow

                    return;

                }