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

Merge "Fix bug with clearing bubble to expand" into tm-qpr-dev am: ebd5de1ccf

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

Change-Id: I33e8b856df97e0641c7c42880bafe73447633aef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ats Jenk
2022-08-23 20:49:07 +00:00
committed by Automerger Merge Worker
parent 08f477877e ebd5de1ccf
commit 2616678911
2 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -538,7 +538,6 @@ public class BubbleController implements ConfigurationChangeListener {
if (mNotifEntryToExpandOnShadeUnlock != null) {
expandStackAndSelectBubble(mNotifEntryToExpandOnShadeUnlock);
mNotifEntryToExpandOnShadeUnlock = null;
}
updateStack();

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

@@ -1395,6 +1395,33 @@ public class BubblesTest extends SysuiTestCase {
assertThat(stackView.getVisibility()).isEqualTo(View.VISIBLE);
}
/**
* Test to verify behavior for following situation:
* <ul>
* <li>status bar shade state is set to <code>false</code></li>
* <li>there is a bubble pending to be expanded</li>
* </ul>
* Test that duplicate status bar state updates to <code>false</code> do not clear the
* pending bubble to be
* expanded.
*/
@Test
public void testOnStatusBarStateChanged_statusBarChangeDoesNotClearExpandingBubble() {
mBubbleController.updateBubble(mBubbleEntry);
mBubbleController.onStatusBarStateChanged(false);
// Set the bubble to expand once status bar state changes
mBubbleController.expandStackAndSelectBubble(mBubbleEntry);
// Check that stack is currently collapsed
assertStackCollapsed();
// Post status bar state change update with the same value
mBubbleController.onStatusBarStateChanged(false);
// Stack should remain collapsedb
assertStackCollapsed();
// Post status bar state change which should trigger bubble to expand
mBubbleController.onStatusBarStateChanged(true);
assertStackExpanded();
}
@Test
public void testSetShouldAutoExpand_notifiesFlagChanged() {
mBubbleController.updateBubble(mBubbleEntry);