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

Commit 07b7339e authored by Andre Le's avatar Andre Le Committed by Android (Google) Code Review
Browse files

Merge "Flexiglass: Disable scene container on some legacy only tests." into main

parents 5d632635 688464fd

packages/SystemUI/multivalentTests/src/com/android/systemui/shade/ShadeControllerImplTest.kt

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import androidx.test.filters.SmallTest 
import com.android.internal.statusbar.IStatusBarService

import com.android.systemui.SysuiTestCase

import com.android.systemui.assist.AssistManager

import com.android.systemui.flags.DisableSceneContainer

import com.android.systemui.keyguard.data.repository.FakeKeyguardRepository

import com.android.systemui.kosmos.testScope

import com.android.systemui.log.LogBuffer
@@ -61,6 +62,7 @@ import org.mockito.MockitoAnnotations 
@RunWith(AndroidJUnit4::class)

@RunWithLooper(setAsMainLooper = true)

@SmallTest

@DisableSceneContainer

class ShadeControllerImplTest : SysuiTestCase() {

    private val executor = FakeExecutor(FakeSystemClock())

    private val kosmos = testKosmos()

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java

+3 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ import static org.mockito.Mockito.verify; 
import static org.mockito.Mockito.when;



import android.platform.test.annotations.DisableFlags;

import android.platform.test.annotations.EnableFlags;

import android.platform.test.flag.junit.CheckFlagsRule;

import android.platform.test.flag.junit.DeviceFlagsValueProvider;

import android.testing.TestableLooper;
@@ -921,6 +920,7 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { 
    }



    @Test

    @DisableSceneContainer

    public void altBouncerNotVisible_keyguardAuthenticatedBiometricsHandled() {

        clearInvocations(mAlternateBouncerInteractor);

        when(mAlternateBouncerInteractor.isVisibleState()).thenReturn(false);
@@ -929,6 +929,7 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { 
    }



    @Test

    @DisableSceneContainer

    public void altBouncerVisible_keyguardAuthenticatedBiometricsHandled() {

        clearInvocations(mAlternateBouncerInteractor);

        when(mAlternateBouncerInteractor.isVisibleState()).thenReturn(true);
@@ -937,6 +938,7 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { 
    }



    @Test

    @DisableSceneContainer

    public void fromAlternateBouncerTransitionStep() {

        clearInvocations(mAlternateBouncerInteractor);

        mStatusBarKeyguardViewManager.consumeFromAlternateBouncerTransitionSteps(