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

Commit 3872f296 authored by Ale Nijamkin's avatar Ale Nijamkin Committed by Android (Google) Code Review
Browse files

Merge changes I68d30e83,I55ae85ff,I4e5c5a1f,I782662fe,I3d4a4c04, ... into main 

* changes:
  [flexiglass] Disable KeyguardWakeDirectlyToGoneInteractorTest when flexi
  [flexiglass] Disables ClockSectionTest if flexi is on
  [flexiglass] Disables KeyguardStateCallbackInteractorTest when flexi on
  [flexiglass] Disables KeyguardShowWhileAwakeInteractorTest if flexi on
  [flexiglass] Fixes quick affordance test when flexi is on
  [flexiglass] Fixes KeyguardKeyEventInteractorTest when flexi is on
parents 72864492 90d0495b

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardKeyEventInteractorTest.kt

+3 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 
import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.back.domain.interactor.BackActionInteractor

import com.android.systemui.flags.DisableSceneContainer

import com.android.systemui.media.controls.util.MediaSessionLegacyHelperWrapper

import com.android.systemui.plugins.statusbar.StatusBarStateController

import com.android.systemui.power.domain.interactor.PowerInteractor
@@ -219,6 +220,7 @@ class KeyguardKeyEventInteractorTest : SysuiTestCase() { 
    }



    @Test

    @DisableSceneContainer

    fun interceptMediaKey_keyguard_SBKVMdoesNotHandle_doesNotHandleMediaKey() {

        val keyEvent = KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_VOLUME_UP)

        whenever(statusBarStateController.state).thenReturn(StatusBarState.KEYGUARD)
@@ -229,6 +231,7 @@ class KeyguardKeyEventInteractorTest : SysuiTestCase() { 
    }



    @Test

    @DisableSceneContainer

    fun interceptMediaKey_keyguard_handleMediaKey() {

        val keyEvent = KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_VOLUME_UP)

        whenever(statusBarStateController.state).thenReturn(StatusBarState.KEYGUARD)

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorTest.kt

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import com.android.systemui.coroutines.collectLastValue 
import com.android.systemui.coroutines.collectValues

import com.android.systemui.dock.DockManager

import com.android.systemui.dock.DockManagerFake

import com.android.systemui.flags.DisableSceneContainer

import com.android.systemui.flags.EnableSceneContainer

import com.android.systemui.flags.FakeFeatureFlags

import com.android.systemui.haptics.msdl.fakeMSDLPlayer
@@ -329,6 +330,7 @@ class KeyguardQuickAffordanceInteractorTest : SysuiTestCase() { 
        }



    @Test

    @DisableSceneContainer

    fun quickAffordance_bottomStartAffordanceHiddenWhenLockscreenIsNotShowing() =

        testScope.runTest {

            repository.setKeyguardShowing(false)

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardShowWhileAwakeInteractorTest.kt

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import androidx.test.filters.SmallTest 
import com.android.internal.widget.lockPatternUtils

import com.android.systemui.SysuiTestCase

import com.android.systemui.coroutines.collectValues

import com.android.systemui.flags.DisableSceneContainer

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

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

import com.android.systemui.keyguard.shared.model.KeyguardState
@@ -40,6 +41,7 @@ import org.mockito.kotlin.whenever 
@SmallTest

@RunWith(AndroidJUnit4::class)

@kotlinx.coroutines.ExperimentalCoroutinesApi

@DisableSceneContainer

class KeyguardShowWhileAwakeInteractorTest : SysuiTestCase() {

    private val kosmos = testKosmos()

    private val testScope = kosmos.testScope

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardStateCallbackInteractorTest.kt

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import com.android.internal.policy.IKeyguardStateCallback 
import com.android.keyguard.trustManager

import com.android.systemui.Flags

import com.android.systemui.SysuiTestCase

import com.android.systemui.flags.DisableSceneContainer

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

import com.android.systemui.keyguard.dismissCallbackRegistry

import com.android.systemui.keyguard.shared.model.KeyguardState
@@ -50,6 +51,7 @@ import org.mockito.kotlin.verify 
@SmallTest

@RunWith(AndroidJUnit4::class)

@EnableFlags(Flags.FLAG_KEYGUARD_WM_STATE_REFACTOR)

@DisableSceneContainer

class KeyguardStateCallbackInteractorTest : SysuiTestCase() {



    private val kosmos = testKosmos()

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardWakeDirectlyToGoneInteractorTest.kt

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import com.android.internal.widget.lockPatternUtils 
import com.android.systemui.Flags

import com.android.systemui.SysuiTestCase

import com.android.systemui.coroutines.collectValues

import com.android.systemui.flags.DisableSceneContainer

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

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

import com.android.systemui.keyguard.shared.model.BiometricUnlockMode
@@ -59,6 +60,7 @@ import org.mockito.kotlin.whenever 


@SmallTest

@RunWith(AndroidJUnit4::class)

@DisableSceneContainer

class KeyguardWakeDirectlyToGoneInteractorTest : SysuiTestCase() {



    private var lastRegisteredBroadcastReceiver: BroadcastReceiver? = null