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

Tell NoMan to update the auto-expand flag

Browse Source 
Bug: 226316876
Test: atest BubblesTest NewNotifPipelineBubblesTest
Change-Id: Iad01b8f35d3481ab0bf080e6319ea9452e9f628d
This commit is contained in:
Mady Mellor
2022-04-27 16:33:17 +00:00
parent 40422db463
commit e4d1834578
3 changed files with 44 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubble.java
View File

@@ -771,12 +771,17 @@ public class Bubble implements BubbleViewProvider {
return isEnabled(Notification.BubbleMetadata.FLAG_AUTO_EXPAND_BUBBLE);
}
void setShouldAutoExpand(boolean shouldAutoExpand) {
@VisibleForTesting
public void setShouldAutoExpand(boolean shouldAutoExpand) {
boolean prevAutoExpand = shouldAutoExpand();
if (shouldAutoExpand) {
enable(Notification.BubbleMetadata.FLAG_AUTO_EXPAND_BUBBLE);
} else {
disable(Notification.BubbleMetadata.FLAG_AUTO_EXPAND_BUBBLE);
}
if (prevAutoExpand != shouldAutoExpand && mBubbleMetadataFlagListener != null) {
mBubbleMetadataFlagListener.onBubbleMetadataFlagChanged(this);
}
}
public void setIsBubble(final boolean isBubble) {

19
packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java
View File

@@ -1447,6 +1447,25 @@ public class BubblesTest extends SysuiTestCase {
assertThat(stackView.getVisibility()).isEqualTo(View.VISIBLE);
}
@Test
public void testSetShouldAutoExpand_notifiesFlagChanged() {
mEntryListener.onPendingEntryAdded(mRow);
assertTrue(mBubbleController.hasBubbles());
Bubble b = mBubbleData.getBubbleInStackWithKey(mBubbleEntry.getKey());
assertThat(b.shouldAutoExpand()).isFalse();
// Set it to the same thing
b.setShouldAutoExpand(false);
// Verify it doesn't notify
verify(mBubbleController, never()).onBubbleMetadataFlagChanged(any());
// Set it to something different
b.setShouldAutoExpand(true);
verify(mBubbleController).onBubbleMetadataFlagChanged(b);
}
/** Creates a bubble using the userId and package. */
private Bubble createBubble(int userId, String pkg) {
final UserHandle userHandle = new UserHandle(userId);

19
packages/SystemUI/tests/src/com/android/systemui/wmshell/NewNotifPipelineBubblesTest.java
View File

@@ -1267,6 +1267,25 @@ public class NewNotifPipelineBubblesTest extends SysuiTestCase {
assertThat(stackView.getVisibility()).isEqualTo(View.VISIBLE);
}
@Test
public void testSetShouldAutoExpand_notifiesFlagChanged() {
mBubbleController.updateBubble(mBubbleEntry);
assertTrue(mBubbleController.hasBubbles());
Bubble b = mBubbleData.getBubbleInStackWithKey(mBubbleEntry.getKey());
assertThat(b.shouldAutoExpand()).isFalse();
// Set it to the same thing
b.setShouldAutoExpand(false);
// Verify it doesn't notify
verify(mBubbleController, never()).onBubbleMetadataFlagChanged(any());
// Set it to something different
b.setShouldAutoExpand(true);
verify(mBubbleController).onBubbleMetadataFlagChanged(b);
}
/**
* Sets the bubble metadata flags for this entry. These flags are normally set by
* NotificationManagerService when the notification is sent, however, these tests do not