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

Commit 4322ba3e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't update the bubble on ranking changes if it's already in the... 

Merge "Don't update the bubble on ranking changes if it's already in the stack" into rvc-dev am: d0c94559 am: ed7a778f am: 93ef6ab9

Change-Id: I937b41073c767594d516beefcee59c89244bf035
parents 19f019e5 93ef6ab9

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

+3 −2
Original line number Diff line number Diff line
@@ -957,9 +957,10 @@ public class BubbleController implements ConfigurationController.ConfigurationLi 
            String key = orderedKeys[i];

            NotificationEntry entry = mNotificationEntryManager.getPendingOrActiveNotif(key);

            rankingMap.getRanking(key, mTmpRanking);

            if (mBubbleData.hasBubbleWithKey(key) && !mTmpRanking.canBubble()) {

            boolean isActiveBubble = mBubbleData.hasBubbleWithKey(key);

            if (isActiveBubble && !mTmpRanking.canBubble()) {

                mBubbleData.notificationEntryRemoved(entry, BubbleController.DISMISS_BLOCKED);

            } else if (entry != null && mTmpRanking.isBubble()) {

            } else if (entry != null && mTmpRanking.isBubble() && !isActiveBubble) {

                entry.setFlagBubble(true);

                onEntryUpdated(entry);

            }

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

+2 −0
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ public class BubbleData { 
                Bubble b = mOverflowBubbles.get(i);

                if (b.getKey().equals(entry.getKey())) {

                    moveOverflowBubbleToPending(b);

                    b.setEntry(entry);

                    return b;

                }

            }
@@ -240,6 +241,7 @@ public class BubbleData { 
            for (int i = 0; i < mPendingBubbles.size(); i++) {

                Bubble b = mPendingBubbles.get(i);

                if (b.getKey().equals(entry.getKey())) {

                    b.setEntry(entry);

                    return b;

                }

            }