Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bubbles behavior in bedtime mode" into sc-v2-dev am: b13cde5c9c

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

Change-Id: Ic0eec06f3c02f232cbd6db48f8fcab96dd69070c
This commit is contained in:
Sergey Serokurov
2021-11-10 19:17:01 +00:00
committed by Automerger Merge Worker
parent bc4efa5b16 b13cde5c9c
commit 2e0c8c8b14
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java
View File

@@ -1036,10 +1036,9 @@ public class BubbleController {
// notification, so that the bubble will be re-created if shouldBubbleUp returns // notification, so that the bubble will be re-created if shouldBubbleUp returns
// true. // true.
mBubbleData.dismissBubbleWithKey(key, DISMISS_NO_BUBBLE_UP); mBubbleData.dismissBubbleWithKey(key, DISMISS_NO_BUBBLE_UP);
} else if (entry != null && mTmpRanking.isBubble() && !isActiveBubble } else if (entry != null && mTmpRanking.isBubble() && !isActiveBubble) {
&& !entry.getRanking().isSuspended()) {
entry.setFlagBubble(true); entry.setFlagBubble(true);
onEntryUpdated(entry, true /* shouldBubbleUp */); onEntryUpdated(entry, shouldBubbleUp && !entry.getRanking().isSuspended());
} }
} }
} }