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

Commit 8834b96d authored by Mady Mellor's avatar Mady Mellor Committed by Automerger Merge Worker
Browse files

Merge "Mark bubbles as updated when they're added to the stack" into sc-v2-dev am: 6b1abd9b 

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

Change-Id: Ib5c93cd4710eeace2f0c54157f9052f5e182455c
parents b4f39650 6b1abd9b

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

+1 −0
Original line number Diff line number Diff line
@@ -328,6 +328,7 @@ public class BubbleData { 
        if (prevBubble == null) {

            // Create a new bubble

            bubble.setSuppressFlyout(suppressFlyout);

            bubble.markUpdatedAt(mTimeSource.currentTimeMillis());

            doAdd(bubble);

            trim();

        } else {

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

+32 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import android.service.notification.NotificationListenerService; 
import android.service.notification.StatusBarNotification;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;

import android.util.Log;

import android.util.Pair;

import android.view.WindowManager;
@@ -913,6 +914,31 @@ public class BubbleDataTest extends ShellTestCase { 
        assertSelectionChangedTo(mBubbleA2);

    }



    /**

      * - have a maxed out bubble stack & all of the bubbles have been recently accessed

      * - bubble a notification that was posted before any of those bubbles were accessed

      * => that bubble should be added

     *

      */

    @Test

    public void test_addOldNotifWithNewerBubbles() {

        sendUpdatedEntryAtTime(mEntryA1, 2000);

        sendUpdatedEntryAtTime(mEntryA2, 3000);

        sendUpdatedEntryAtTime(mEntryA3, 4000);

        sendUpdatedEntryAtTime(mEntryB1, 5000);

        sendUpdatedEntryAtTime(mEntryB2, 6000);



        mBubbleData.setListener(mListener);

        sendUpdatedEntryAtTime(mEntryB3, 1000 /* postTime */, 7000 /* currentTime */);

        verifyUpdateReceived();



        // B3 is in the stack

        assertThat(mBubbleData.getBubbleInStackWithKey(mBubbleB3.getKey())).isNotNull();

        // A1 is the oldest so it's in the overflow

        assertThat(mBubbleData.getOverflowBubbleWithKey(mEntryA1.getKey())).isNotNull();

        assertOrderChangedTo(mBubbleB3, mBubbleB2, mBubbleB1, mBubbleA3, mBubbleA2);

    }



    private void verifyUpdateReceived() {

        verify(mListener).applyUpdate(mUpdateCaptor.capture());

        reset(mListener);
@@ -1014,6 +1040,12 @@ public class BubbleDataTest extends ShellTestCase { 
    }



    private void sendUpdatedEntryAtTime(BubbleEntry entry, long postTime) {

        setCurrentTime(postTime);

        sendUpdatedEntryAtTime(entry, postTime, true /* isTextChanged */);

    }



    private void sendUpdatedEntryAtTime(BubbleEntry entry, long postTime, long currentTime) {

        setCurrentTime(currentTime);

        sendUpdatedEntryAtTime(entry, postTime, true /* isTextChanged */);

    }