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

Commit 82bc7b87 authored by Darrell Shi's avatar Darrell Shi
Browse files

Do not show tutorial indicator when communal unavailable 

Test: atest CommunalTutorialInteractorTest
Test: verify do not see tutorial indicator when communal unavailable,
e.g. on secondary user
Bug: 316219231
Fix: 316219231
Flag: ACONFIG com.android.systemui.communal_hub DEVELOPMENT

Change-Id: I736337c00dee981fba362d281da375d128a145e3
parent bcbd6884

packages/SystemUI/multivalentTests/src/com/android/systemui/communal/domain/interactor/CommunalTutorialInteractorTest.kt

+22 −10
Original line number Diff line number Diff line
@@ -30,17 +30,12 @@ import com.android.systemui.coroutines.collectLastValue 
import com.android.systemui.keyguard.data.repository.FakeKeyguardRepository

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

import com.android.systemui.kosmos.testScope

import com.android.systemui.settings.UserTracker

import com.android.systemui.testKosmos

import com.android.systemui.util.mockito.mock

import com.android.systemui.util.mockito.whenever

import com.google.common.truth.Truth.assertThat

import kotlinx.coroutines.test.runTest

import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.Mock

import org.mockito.MockitoAnnotations



@SmallTest

@RunWith(AndroidJUnit4::class)
@@ -48,24 +43,22 @@ class CommunalTutorialInteractorTest : SysuiTestCase() { 
    private val kosmos = testKosmos()

    private val testScope = kosmos.testScope



    @Mock private lateinit var userTracker: UserTracker



    private lateinit var underTest: CommunalTutorialInteractor

    private lateinit var keyguardRepository: FakeKeyguardRepository

    private lateinit var communalTutorialRepository: FakeCommunalTutorialRepository

    private lateinit var communalRepository: FakeCommunalRepository

    private lateinit var communalInteractor: CommunalInteractor



    @Before

    fun setUp() {

        MockitoAnnotations.initMocks(this)



        keyguardRepository = kosmos.fakeKeyguardRepository

        communalTutorialRepository = kosmos.fakeCommunalTutorialRepository

        communalRepository = kosmos.fakeCommunalRepository

        communalInteractor = kosmos.communalInteractor



        underTest = kosmos.communalTutorialInteractor



        whenever(userTracker.userHandle).thenReturn(mock())

        setCommunalAvailable(true)

    }



    @Test
@@ -88,6 +81,16 @@ class CommunalTutorialInteractorTest : SysuiTestCase() { 
            assertThat(isTutorialAvailable).isFalse()

        }



    @Test

    fun tutorialUnavailable_whenCommunalNotAvailable() =

        testScope.runTest {

            val isTutorialAvailable by collectLastValue(underTest.isTutorialAvailable)

            setCommunalAvailable(false)

            communalTutorialRepository.setTutorialSettingState(HUB_MODE_TUTORIAL_NOT_STARTED)

            keyguardRepository.setKeyguardShowing(true)

            assertThat(isTutorialAvailable).isFalse()

        }



    @Test

    fun tutorialAvailable_whenTutorialNotStarted() =

        testScope.runTest {
@@ -183,4 +186,13 @@ class CommunalTutorialInteractorTest : SysuiTestCase() { 


            assertThat(tutorialSettingState).isEqualTo(HUB_MODE_TUTORIAL_COMPLETED)

        }



    private fun setCommunalAvailable(available: Boolean) {

        if (available) {

            communalRepository.setIsCommunalEnabled(true)

            keyguardRepository.setIsEncryptedOrLockdown(false)

        } else {

            keyguardRepository.setIsEncryptedOrLockdown(true)

        }

    }

}

packages/SystemUI/multivalentTests/src/com/android/systemui/communal/view/viewmodel/CommunalViewModelTest.kt

+2 −1
Original line number Diff line number Diff line
@@ -103,9 +103,10 @@ class CommunalViewModelTest : SysuiTestCase() { 
    @Test

    fun tutorial_tutorialNotCompletedAndKeyguardVisible_showTutorialContent() =

        testScope.runTest {

            // Keyguard showing, and tutorial not started.

            // Keyguard showing, storage unlocked, and tutorial not started.

            keyguardRepository.setKeyguardShowing(true)

            keyguardRepository.setKeyguardOccluded(false)

            keyguardRepository.setIsEncryptedOrLockdown(false)

            tutorialRepository.setTutorialSettingState(

                Settings.Secure.HUB_MODE_TUTORIAL_NOT_STARTED

            )

packages/SystemUI/src/com/android/systemui/communal/domain/interactor/CommunalTutorialInteractor.kt

+5 −2
Original line number Diff line number Diff line
@@ -45,13 +45,16 @@ constructor( 
    private val communalTutorialRepository: CommunalTutorialRepository,

    keyguardInteractor: KeyguardInteractor,

    private val communalRepository: CommunalRepository,

    communalInteractor: CommunalInteractor,

) {

    /** An observable for whether the tutorial is available. */

    val isTutorialAvailable: Flow<Boolean> =

        combine(

                communalInteractor.isCommunalAvailable,

                keyguardInteractor.isKeyguardVisible,

                communalTutorialRepository.tutorialSettingState,

            ) { isKeyguardVisible, tutorialSettingState ->

            ) { isCommunalAvailable, isKeyguardVisible, tutorialSettingState ->

                isCommunalAvailable &&

                    isKeyguardVisible &&

                    tutorialSettingState != Settings.Secure.HUB_MODE_TUTORIAL_COMPLETED

            }

packages/SystemUI/tests/utils/src/com/android/systemui/communal/domain/interactor/CommunalTutorialInteractorKosmos.kt

+1 −0
Original line number Diff line number Diff line
@@ -29,5 +29,6 @@ val Kosmos.communalTutorialInteractor by 
            communalTutorialRepository = communalTutorialRepository,

            keyguardInteractor = keyguardInteractor,

            communalRepository = communalRepository,

            communalInteractor = communalInteractor,

        )

    }