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

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

Browse Source
This commit is contained in:
Mady Mellor
2021-12-14 01:16:23 +00:00
committed by Android (Google) Code Review
parent bda966d4d0 fecc199440
commit 6b1abd9b68
2 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -328,6 +328,7 @@ public class BubbleData {
if (prevBubble == null) { if (prevBubble == null) {
// Create a new bubble // Create a new bubble
bubble.setSuppressFlyout(suppressFlyout); bubble.setSuppressFlyout(suppressFlyout);
bubble.markUpdatedAt(mTimeSource.currentTimeMillis());
doAdd(bubble); doAdd(bubble);
trim(); trim();
} else { } else {

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

@@ -39,6 +39,7 @@ import android.service.notification.NotificationListenerService;
import android.service.notification.StatusBarNotification; import android.service.notification.StatusBarNotification;
import android.testing.AndroidTestingRunner; import android.testing.AndroidTestingRunner;
import android.testing.TestableLooper; import android.testing.TestableLooper;
import android.util.Log;
import android.util.Pair; import android.util.Pair;
import android.view.WindowManager; import android.view.WindowManager;
@@ -913,6 +914,31 @@ public class BubbleDataTest extends ShellTestCase {
assertSelectionChangedTo(mBubbleA2); 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() { private void verifyUpdateReceived() {
verify(mListener).applyUpdate(mUpdateCaptor.capture()); verify(mListener).applyUpdate(mUpdateCaptor.capture());
reset(mListener); reset(mListener);
@@ -1014,6 +1040,12 @@ public class BubbleDataTest extends ShellTestCase {
} }
private void sendUpdatedEntryAtTime(BubbleEntry entry, long postTime) { 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 */); sendUpdatedEntryAtTime(entry, postTime, true /* isTextChanged */);
} }