Don't show flyout if its not visually interruptive
Test: atest BubbleDataTest
Fixes: 148107835
Change-Id: Ifacac80d4a31f657d9cd46db08847af4ffa8992b
diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleData.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleData.java
index ccbbb24..cc0824e 100644
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleData.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleData.java
@@ -218,7 +218,7 @@
}
mPendingBubbles.remove(bubble); // No longer pending once we're here
Bubble prevBubble = getBubbleWithKey(bubble.getKey());
- suppressFlyout |= !shouldShowFlyout(bubble.getEntry());
+ suppressFlyout |= !bubble.getEntry().getRanking().visuallyInterruptive();
if (prevBubble == null) {
// Create a new bubble
@@ -329,14 +329,6 @@
return bubbleChildren;
}
- private boolean shouldShowFlyout(NotificationEntry notif) {
- if (notif.getRanking().visuallyInterruptive()) {
- return true;
- }
- return hasBubbleWithKey(notif.getKey())
- && !getBubbleWithKey(notif.getKey()).showInShade();
- }
-
private void doAdd(Bubble bubble) {
if (DEBUG_BUBBLE_DATA) {
Log.d(TAG, "doAdd: " + bubble);
diff --git a/packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleDataTest.java b/packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleDataTest.java
index c4ae409..5c24769 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleDataTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleDataTest.java
@@ -228,7 +228,7 @@
}
@Test
- public void sameUpdate_NotInShade_showFlyout() {
+ public void sameUpdate_NotInShade_NotVisuallyInterruptive_dontShowFlyout() {
// Setup
mBubbleData.setListener(mListener);
@@ -247,7 +247,7 @@
// Verify
BubbleData.Update update = mUpdateCaptor.getValue();
- assertThat(update.updatedBubble.showFlyout()).isTrue();
+ assertThat(update.updatedBubble.showFlyout()).isFalse();
}
// COLLAPSED / ADD