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

Commit cfd88e18 authored by Mady Mellor's avatar Mady Mellor Committed by Android (Google) Code Review
Browse files

Merge "Allow app bubbles to be overflowed" into main

parents 1b5e0a7b 8e65e086

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleData.java

+1 −2
Original line number Diff line number Diff line
@@ -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) {

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubbleDataTest.java

+2 −2
Original line number Diff line number Diff line
@@ -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();

    }