Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fae175b7 authored by Mady Mellor's avatar Mady Mellor Committed by Android (Google) Code Review
Browse files

Merge "Ensure Bubbles get removed at the end of the test" into tm-qpr-dev

parents 5ff4c03f 006a03aa

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

+4 −2
Original line number Original line Diff line number Diff line
@@ -2923,8 +2923,10 @@ public class BubbleStackView extends FrameLayout 
                    .withEndActions(() -> {

                    .withEndActions(() -> {

                        View child = mManageMenu.getChildAt(0);

                        View child = mManageMenu.getChildAt(0);

                        child.requestAccessibilityFocus();

                        child.requestAccessibilityFocus();

                        // Update the AV's obscured touchable region for the new visibility state.

                        if (mExpandedBubble != null && mExpandedBubble.getExpandedView() != null) {

                            // Update the AV's obscured touchable region for the new state.

                            mExpandedBubble.getExpandedView().updateObscuredTouchableRegion();

                            mExpandedBubble.getExpandedView().updateObscuredTouchableRegion();

                        }

                    })

                    })

                    .start();

                    .start();

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

+11 −2
Original line number Original line Diff line number Diff line
@@ -77,7 +77,6 @@ import android.view.View; 
import android.view.ViewTreeObserver;

import android.view.ViewTreeObserver;

import android.view.WindowManager;

import android.view.WindowManager;





import androidx.test.filters.FlakyTest;

import androidx.test.filters.SmallTest;

import androidx.test.filters.SmallTest;





import com.android.internal.colorextraction.ColorExtractor;

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.ShellController;

import com.android.wm.shell.sysui.ShellInit;

import com.android.wm.shell.sysui.ShellInit;





import org.junit.After;

import org.junit.Before;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.Test;
@@ -152,13 +152,13 @@ import org.mockito.Mock; 
import org.mockito.MockitoAnnotations;

import org.mockito.MockitoAnnotations;

import org.mockito.stubbing.Answer;

import org.mockito.stubbing.Answer;





import java.util.ArrayList;

import java.util.Arrays;

import java.util.Arrays;

import java.util.Collections;

import java.util.Collections;

import java.util.HashMap;

import java.util.HashMap;

import java.util.List;

import java.util.List;

import java.util.Optional;

import java.util.Optional;





@FlakyTest

@SmallTest

@SmallTest

@RunWith(AndroidTestingRunner.class)

@RunWith(AndroidTestingRunner.class)

@TestableLooper.RunWithLooper(setAsMainLooper = true)

@TestableLooper.RunWithLooper(setAsMainLooper = true)
@@ -411,6 +411,15 @@ public class BubblesTest extends SysuiTestCase { 
                .addCallback(mKeyguardStateControllerCallbackCaptor.capture());

                .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

    @Test

    public void dreamingHidesBubbles() throws RemoteException {

    public void dreamingHidesBubbles() throws RemoteException {

        mBubbleController.updateBubble(mBubbleEntry);

        mBubbleController.updateBubble(mBubbleEntry);