diff options
| author | 2023-12-07 16:35:53 +0000 | |
|---|---|---|
| committer | 2023-12-07 16:35:53 +0000 | |
| commit | cfd88e189442a58006e788f364aa0c4cd07b3564 (patch) | |
| tree | 3c6f82ab7ae19af2fdb227b233728c13dace18ff | |
| parent | 1b5e0a7b746a0fb800561103d6007efd5ac1633a (diff) | |
| parent | 8e65e08644e7bc05867869c2e8ad52e91216a723 (diff) | |
Merge "Allow app bubbles to be overflowed" into main
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleData.java | 3 | ||||
| -rw-r--r-- | libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubbleDataTest.java | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleData.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleData.java index 595a4afbfc86..bbb4b74c2a17 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleData.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleData.java @@ -784,8 +784,7 @@ public class BubbleData { if (bubble.getPendingIntentCanceled() || !(reason == Bubbles.DISMISS_AGED || reason == Bubbles.DISMISS_USER_GESTURE - || reason == Bubbles.DISMISS_RELOAD_FROM_DISK) - || bubble.isAppBubble()) { + || reason == Bubbles.DISMISS_RELOAD_FROM_DISK)) { return; } if (DEBUG_BUBBLE_DATA) { diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubbleDataTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubbleDataTest.java index 4bca96b187b5..fad497c981f1 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubbleDataTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubbleDataTest.java @@ -1162,7 +1162,7 @@ public class BubbleDataTest extends ShellTestCase { } @Test - public void test_removeAppBubble_skipsOverflow() { + public void test_removeAppBubble_overflows() { String appBubbleKey = mAppBubble.getKey(); mBubbleData.notificationEntryUpdated(mAppBubble, true /* suppressFlyout*/, false /* showInShade */); @@ -1170,7 +1170,7 @@ public class BubbleDataTest extends ShellTestCase { mBubbleData.dismissBubbleWithKey(appBubbleKey, Bubbles.DISMISS_USER_GESTURE); - assertThat(mBubbleData.getOverflowBubbleWithKey(appBubbleKey)).isNull(); + assertThat(mBubbleData.getOverflowBubbleWithKey(appBubbleKey)).isEqualTo(mAppBubble); assertThat(mBubbleData.getBubbleInStackWithKey(appBubbleKey)).isNull(); } |