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

Merge "Revert "Do not show overflow after the last bubble dismissed (in master).""

Browse Source
This commit is contained in:
Michał Brzeziński
2021-12-09 14:53:48 +00:00
committed by Android (Google) Code Review
parent ea650c5c14 8ec095245a
commit ba5ad7041a
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -561,10 +561,17 @@ public class BubbleData {
overflowBubble(reason, bubbleToRemove);
if (mBubbles.size() == 1) {
setExpandedInternal(false);
// Don't use setSelectedBubbleInternal because we don't want to trigger an
// applyUpdate
mSelectedBubble = null;
if (hasOverflowBubbles() && (mPositioner.showingInTaskbar() || isExpanded())) {
// No more active bubbles but we have stuff in the overflow -- select that view
// if we're already expanded or always showing.
setShowingOverflow(true);
setSelectedBubbleInternal(mOverflow);
} else {
setExpandedInternal(false);
// Don't use setSelectedBubbleInternal because we don't want to trigger an
// applyUpdate
mSelectedBubble = null;
}
}
if (indexToRemove < mBubbles.size() - 1) {
// Removing anything but the last bubble means positions will change.

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

@@ -793,7 +793,7 @@ public class BubbleDataTest extends ShellTestCase {
}
@Test
public void test_expanded_removeLastBubble_collapsesIfOverflowNotEmpty() {
public void test_expanded_removeLastBubble_showsOverflowIfNotEmpty() {
// Setup
sendUpdatedEntryAtTime(mEntryA1, 1000);
changeExpandedStateAtTime(true, 2000);
@@ -803,7 +803,7 @@ public class BubbleDataTest extends ShellTestCase {
mBubbleData.dismissBubbleWithKey(mEntryA1.getKey(), Bubbles.DISMISS_USER_GESTURE);
verifyUpdateReceived();
assertThat(mBubbleData.getOverflowBubbles().size()).isGreaterThan(0);
assertExpandedChangedTo(false);
assertSelectionChangedTo(mBubbleData.getOverflow());
}
@Test