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

Merge "Ensure Bubbles get removed at the end of the test" into tm-qpr-dev am: fae175b75f am: 976aca3b08

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

Change-Id: I893a509d2e7b5907bf5824ee256440d87f4db2c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mady Mellor
2022-12-19 22:40:39 +00:00
committed by Automerger Merge Worker
parent 15578ff7b0 976aca3b08
commit 392a8cb434
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java
View File

@@ -2922,8 +2922,10 @@ public class BubbleStackView extends FrameLayout
.withEndActions(() -> {
View child = mManageMenu.getChildAt(0);
child.requestAccessibilityFocus();
// Update the AV's obscured touchable region for the new visibility state.
mExpandedBubble.getExpandedView().updateObscuredTouchableRegion();
if (mExpandedBubble != null && mExpandedBubble.getExpandedView() != null) {
// Update the AV's obscured touchable region for the new state.
mExpandedBubble.getExpandedView().updateObscuredTouchableRegion();
}
})
.start();

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

@@ -77,7 +77,6 @@ import android.view.View;
import android.view.ViewTreeObserver;
import android.view.WindowManager;
import androidx.test.filters.FlakyTest;
import androidx.test.filters.SmallTest;
import com.android.internal.colorextraction.ColorExtractor;
@@ -142,6 +141,7 @@ import com.android.wm.shell.sysui.ShellCommandHandler;
import com.android.wm.shell.sysui.ShellController;
import com.android.wm.shell.sysui.ShellInit;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
@@ -152,13 +152,13 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.mockito.stubbing.Answer;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Optional;
@FlakyTest
@SmallTest
@RunWith(AndroidTestingRunner.class)
@TestableLooper.RunWithLooper(setAsMainLooper = true)
@@ -411,6 +411,15 @@ public class BubblesTest extends SysuiTestCase {
.addCallback(mKeyguardStateControllerCallbackCaptor.capture());
}
@After
public void tearDown() {
ArrayList<Bubble> bubbles = new ArrayList<>(mBubbleData.getBubbles());
for (int i = 0; i < bubbles.size(); i++) {
mBubbleController.removeBubble(bubbles.get(i).getKey(),
Bubbles.DISMISS_NO_LONGER_BUBBLE);
}
}
@Test
public void dreamingHidesBubbles() throws RemoteException {
mBubbleController.updateBubble(mBubbleEntry);