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

Commit 732ada83 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Listen to CommandQueue.Callbacks#onDisplayRemoveSystemDecorations and... 

Merge "Listen to  CommandQueue.Callbacks#onDisplayRemoveSystemDecorations and #onDisplayAddSystemDecorations to remove/add status bar." into main
parents 47082296 6762b21a

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/core/MultiDisplayStatusBarOrchestratorStoreTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -50,11 +50,11 @@ class MultiDisplayStatusBarOrchestratorStoreTest : SysuiTestCase() { 
    @Before fun addDisplays() = runBlocking { fakeDisplayRepository.addDisplay(DEFAULT_DISPLAY) }



    @Test

    fun displayRemoved_stopsInstance() =

    fun systemDecorationRemovedEvent_stopsInstance() =

        testScope.runTest {

            val instance = underTest.forDisplay(DEFAULT_DISPLAY)!!



            fakeDisplayRepository.removeDisplay(DEFAULT_DISPLAY)

            fakeDisplayRepository.triggerRemoveSystemDecorationEvent(DEFAULT_DISPLAY)



            verify(instance).stop()

        }

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/core/MultiDisplayStatusBarStarterTest.kt

+50 −226
Original line number Diff line number Diff line
@@ -17,8 +17,7 @@ 
package com.android.systemui.statusbar.core



import android.platform.test.annotations.EnableFlags

import android.view.Display

import android.view.mockIWindowManager

import android.view.Display.DEFAULT_DISPLAY

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase
@@ -29,6 +28,8 @@ import com.android.systemui.statusbar.data.repository.fakePrivacyDotWindowContro 
import com.android.systemui.testKosmos

import com.google.common.truth.Expect

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

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.runBlocking

import kotlinx.coroutines.test.runCurrent

import kotlinx.coroutines.test.runTest

import org.junit.Before
@@ -37,11 +38,11 @@ import org.junit.Test 
import org.junit.runner.RunWith

import org.mockito.kotlin.never

import org.mockito.kotlin.verify

import org.mockito.kotlin.whenever



@SmallTest

@RunWith(AndroidJUnit4::class)

@EnableFlags(StatusBarConnectedDisplays.FLAG_NAME)

@OptIn(ExperimentalCoroutinesApi::class)

class MultiDisplayStatusBarStarterTest : SysuiTestCase() {

    @get:Rule val expect: Expect = Expect.create()
@@ -52,293 +53,116 @@ class MultiDisplayStatusBarStarterTest : SysuiTestCase() { 
    private val fakeInitializerStore = kosmos.fakeStatusBarInitializerStore

    private val fakePrivacyDotStore = kosmos.fakePrivacyDotWindowControllerStore

    private val fakeLightBarStore = kosmos.fakeLightBarControllerStore

    private val windowManager = kosmos.mockIWindowManager



    // Lazy, so that @EnableFlags is set before initializer is instantiated.

    private val underTest by lazy { kosmos.multiDisplayStatusBarStarter }



    @Before

    fun setup() {

        whenever(windowManager.shouldShowSystemDecors(Display.DEFAULT_DISPLAY)).thenReturn(true)

        whenever(windowManager.shouldShowSystemDecors(DISPLAY_1)).thenReturn(true)

        whenever(windowManager.shouldShowSystemDecors(DISPLAY_2)).thenReturn(true)

        whenever(windowManager.shouldShowSystemDecors(DISPLAY_3)).thenReturn(true)

        whenever(windowManager.shouldShowSystemDecors(DISPLAY_4_NO_SYSTEM_DECOR)).thenReturn(false)

    fun setUp() = runBlocking {

        fakeDisplayRepository.addDisplay(DEFAULT_DISPLAY)

        fakeDisplayRepository.addDisplay(DISPLAY_2)

    }



    @Test

    fun start_startsInitializersForCurrentDisplays() =

    fun start_triggerAddDisplaySystemDecoration_startsInitializersForDisplay() =

        testScope.runTest {

            fakeDisplayRepository.addDisplay(displayId = DISPLAY_1)

            fakeDisplayRepository.addDisplay(displayId = DISPLAY_2)

            fakeDisplayRepository.addDisplay(displayId = DISPLAY_4_NO_SYSTEM_DECOR)



            underTest.start()

            runCurrent()



            expect

                .that(fakeInitializerStore.forDisplay(displayId = DISPLAY_1).startedByCoreStartable)

                .isTrue()

            expect

                .that(fakeInitializerStore.forDisplay(displayId = DISPLAY_2).startedByCoreStartable)

                .isTrue()

            fakeDisplayRepository.triggerAddDisplaySystemDecorationEvent(

                displayId = DEFAULT_DISPLAY

            )

            fakeDisplayRepository.triggerAddDisplaySystemDecorationEvent(displayId = DISPLAY_2)



            expect

                .that(

                    fakeInitializerStore

                        .forDisplay(displayId = DISPLAY_4_NO_SYSTEM_DECOR)

                        .forDisplay(displayId = DEFAULT_DISPLAY)

                        .startedByCoreStartable

                )

                .isFalse()

                .isTrue()

            expect

                .that(fakeInitializerStore.forDisplay(displayId = DISPLAY_2).startedByCoreStartable)

                .isTrue()

        }



    @Test

    fun start_startsOrchestratorForCurrentDisplays() =

    fun start_triggerAddDisplaySystemDecoration_startsOrchestratorForDisplay() =

        testScope.runTest {

            fakeDisplayRepository.addDisplay(displayId = DISPLAY_1)

            fakeDisplayRepository.addDisplay(displayId = DISPLAY_2)

            fakeDisplayRepository.addDisplay(displayId = DISPLAY_4_NO_SYSTEM_DECOR)



            underTest.start()

            runCurrent()



            verify(fakeOrchestratorFactory.createdOrchestratorForDisplay(displayId = DISPLAY_1)!!)

                .start()

            verify(fakeOrchestratorFactory.createdOrchestratorForDisplay(displayId = DISPLAY_2)!!)

                .start()

            assertThat(

                    fakeOrchestratorFactory.createdOrchestratorForDisplay(

                        displayId = DISPLAY_4_NO_SYSTEM_DECOR

            fakeDisplayRepository.triggerAddDisplaySystemDecorationEvent(

                displayId = DEFAULT_DISPLAY

            )

                )

                .isNull()

        }



    @Test

    fun start_startsPrivacyDotForCurrentDisplays() =

        testScope.runTest {

            fakeDisplayRepository.addDisplay(displayId = DISPLAY_1)

            fakeDisplayRepository.addDisplay(displayId = DISPLAY_2)

            fakeDisplayRepository.addDisplay(displayId = DISPLAY_4_NO_SYSTEM_DECOR)



            underTest.start()

            runCurrent()



            verify(fakePrivacyDotStore.forDisplay(displayId = DISPLAY_1)).start()

            verify(fakePrivacyDotStore.forDisplay(displayId = DISPLAY_2)).start()

            verify(fakePrivacyDotStore.forDisplay(displayId = DISPLAY_4_NO_SYSTEM_DECOR), never())

                .start()

        }



    @Test

    fun start_doesNotStartLightBarControllerForCurrentDisplays() =

        testScope.runTest {

            fakeDisplayRepository.addDisplay(displayId = DISPLAY_1)

            fakeDisplayRepository.addDisplay(displayId = DISPLAY_2)

            fakeDisplayRepository.addDisplay(displayId = DISPLAY_4_NO_SYSTEM_DECOR)



            underTest.start()

            fakeDisplayRepository.triggerAddDisplaySystemDecorationEvent(displayId = DISPLAY_2)

            runCurrent()



            verify(fakeLightBarStore.forDisplay(displayId = DISPLAY_1), never()).start()

            verify(fakeLightBarStore.forDisplay(displayId = DISPLAY_2), never()).start()

            verify(fakeLightBarStore.forDisplay(displayId = DISPLAY_4_NO_SYSTEM_DECOR), never())

                .start()

        }



    @Test

    fun start_createsLightBarControllerForCurrentDisplays() =

        testScope.runTest {

            fakeDisplayRepository.addDisplay(displayId = DISPLAY_1)

            fakeDisplayRepository.addDisplay(displayId = DISPLAY_2)

            fakeDisplayRepository.addDisplay(displayId = DISPLAY_4_NO_SYSTEM_DECOR)



            underTest.start()

            runCurrent()



            assertThat(fakeLightBarStore.perDisplayMocks.keys).containsExactly(1, DISPLAY_2)

        }



    @Test

    fun start_doesNotStartPrivacyDotForDefaultDisplay() =

        testScope.runTest {

            fakeDisplayRepository.addDisplay(displayId = Display.DEFAULT_DISPLAY)



            underTest.start()

            runCurrent()



            verify(fakePrivacyDotStore.forDisplay(displayId = Display.DEFAULT_DISPLAY), never())

                .start()

        }



    @Test

    fun displayAdded_orchestratorForNewDisplay() =

        testScope.runTest {

            underTest.start()

            runCurrent()



            fakeDisplayRepository.addDisplay(displayId = DISPLAY_3)

            fakeDisplayRepository.addDisplay(displayId = DISPLAY_4_NO_SYSTEM_DECOR)

            runCurrent()



            verify(fakeOrchestratorFactory.createdOrchestratorForDisplay(displayId = DISPLAY_3)!!)

                .start()

            assertThat(

            verify(

                    fakeOrchestratorFactory.createdOrchestratorForDisplay(

                        displayId = DISPLAY_4_NO_SYSTEM_DECOR

                    )

                )

                .isNull()

        }



    @Test

    fun displayAdded_initializerForNewDisplay() =

        testScope.runTest {

            underTest.start()

            runCurrent()



            fakeDisplayRepository.addDisplay(displayId = DISPLAY_3)

            fakeDisplayRepository.addDisplay(displayId = DISPLAY_4_NO_SYSTEM_DECOR)

            runCurrent()



            expect

                .that(fakeInitializerStore.forDisplay(displayId = DISPLAY_3).startedByCoreStartable)

                .isTrue()

            expect

                .that(

                    fakeInitializerStore

                        .forDisplay(displayId = DISPLAY_4_NO_SYSTEM_DECOR)

                        .startedByCoreStartable

                        displayId = DEFAULT_DISPLAY

                    )!!

                )

                .isFalse()

        }



    @Test

    fun displayAdded_privacyDotForNewDisplay() =

        testScope.runTest {

            underTest.start()

            runCurrent()



            fakeDisplayRepository.addDisplay(displayId = DISPLAY_3)

            fakeDisplayRepository.addDisplay(displayId = DISPLAY_4_NO_SYSTEM_DECOR)

            runCurrent()



            verify(fakePrivacyDotStore.forDisplay(displayId = DISPLAY_3)).start()

            verify(fakePrivacyDotStore.forDisplay(displayId = DISPLAY_4_NO_SYSTEM_DECOR), never())

                .start()

            verify(fakeOrchestratorFactory.createdOrchestratorForDisplay(displayId = DISPLAY_2)!!)

                .start()

        }



    @Test

    fun displayAdded_lightBarForNewDisplayCreate() =

        testScope.runTest {

            underTest.start()

            runCurrent()



            fakeDisplayRepository.addDisplay(displayId = DISPLAY_3)

            fakeDisplayRepository.addDisplay(displayId = DISPLAY_4_NO_SYSTEM_DECOR)

            runCurrent()



            assertThat(fakeLightBarStore.perDisplayMocks.keys).containsExactly(DISPLAY_3)

        }



    @Test

    fun displayAdded_lightBarForNewDisplayStart() =

    fun start_triggerAddDisplaySystemDecoration_startsPrivacyDotForNonDefaultDisplay() =

        testScope.runTest {

            underTest.start()

            runCurrent()



            fakeDisplayRepository.addDisplay(displayId = DISPLAY_3)

            fakeDisplayRepository.addDisplay(displayId = DISPLAY_4_NO_SYSTEM_DECOR)

            runCurrent()

            fakeDisplayRepository.triggerAddDisplaySystemDecorationEvent(displayId = DISPLAY_2)



            verify(fakeLightBarStore.forDisplay(displayId = DISPLAY_3), never()).start()

            verify(fakeLightBarStore.forDisplay(displayId = DISPLAY_4_NO_SYSTEM_DECOR), never())

                .start()

            verify(fakePrivacyDotStore.forDisplay(displayId = DISPLAY_2)).start()

        }



    @Test

    fun displayAddedDuringStart_initializerForNewDisplay() =

    fun start_triggerAddDisplaySystemDecoration_doesNotStartPrivacyDotForDefaultDisplay() =

        testScope.runTest {

            underTest.start()



            fakeDisplayRepository.addDisplay(displayId = DISPLAY_3)

            fakeDisplayRepository.addDisplay(displayId = DISPLAY_4_NO_SYSTEM_DECOR)

            runCurrent()



            expect

                .that(fakeInitializerStore.forDisplay(displayId = DISPLAY_3).startedByCoreStartable)

                .isTrue()

            expect

                .that(

                    fakeInitializerStore

                        .forDisplay(displayId = DISPLAY_4_NO_SYSTEM_DECOR)

                        .startedByCoreStartable

            fakeDisplayRepository.triggerAddDisplaySystemDecorationEvent(

                displayId = DEFAULT_DISPLAY

            )

                .isFalse()



            verify(fakePrivacyDotStore.forDisplay(displayId = DEFAULT_DISPLAY), never()).start()

        }



    @Test

    fun displayAddedDuringStart_orchestratorForNewDisplay() =

    fun start_triggerAddDisplaySystemDecoration_doesNotStartLightBarControllerForDisplays() =

        testScope.runTest {

            underTest.start()



            fakeDisplayRepository.addDisplay(displayId = DISPLAY_3)

            fakeDisplayRepository.addDisplay(displayId = DISPLAY_4_NO_SYSTEM_DECOR)

            runCurrent()



            verify(fakeOrchestratorFactory.createdOrchestratorForDisplay(displayId = DISPLAY_3)!!)

                .start()

            assertThat(

                    fakeOrchestratorFactory.createdOrchestratorForDisplay(

                        displayId = DISPLAY_4_NO_SYSTEM_DECOR

            fakeDisplayRepository.triggerAddDisplaySystemDecorationEvent(

                displayId = DEFAULT_DISPLAY

            )

                )

                .isNull()

        }

            fakeDisplayRepository.triggerAddDisplaySystemDecorationEvent(displayId = DISPLAY_2)



    @Test

    fun displayAddedDuringStart_privacyDotForNewDisplay() =

        testScope.runTest {

            underTest.start()



            fakeDisplayRepository.addDisplay(displayId = DISPLAY_3)

            fakeDisplayRepository.addDisplay(displayId = DISPLAY_4_NO_SYSTEM_DECOR)

            runCurrent()



            verify(fakePrivacyDotStore.forDisplay(displayId = DISPLAY_3)).start()

            verify(fakePrivacyDotStore.forDisplay(displayId = DISPLAY_4_NO_SYSTEM_DECOR), never())

                .start()

            verify(fakeLightBarStore.forDisplay(displayId = DEFAULT_DISPLAY), never()).start()

            verify(fakeLightBarStore.forDisplay(displayId = DISPLAY_2), never()).start()

        }



    @Test

    fun displayAddedDuringStart_lightBarForNewDisplayCreate() =

    fun start_triggerAddDisplaySystemDecoration_createsLightBarControllerForDisplay() =

        testScope.runTest {

            underTest.start()



            fakeDisplayRepository.addDisplay(displayId = DISPLAY_3)

            fakeDisplayRepository.addDisplay(displayId = DISPLAY_4_NO_SYSTEM_DECOR)

            runCurrent()



            assertThat(fakeLightBarStore.perDisplayMocks.keys).containsExactly(DISPLAY_3)

        }



    @Test

    fun displayAddedDuringStart_lightBarForNewDisplayStart() =

        testScope.runTest {

            underTest.start()



            fakeDisplayRepository.addDisplay(displayId = DISPLAY_3)

            fakeDisplayRepository.addDisplay(displayId = DISPLAY_4_NO_SYSTEM_DECOR)

            runCurrent()

            fakeDisplayRepository.triggerAddDisplaySystemDecorationEvent(

                displayId = DEFAULT_DISPLAY

            )

            fakeDisplayRepository.triggerAddDisplaySystemDecorationEvent(displayId = DISPLAY_2)



            verify(fakeLightBarStore.forDisplay(displayId = DISPLAY_3), never()).start()

            verify(fakeLightBarStore.forDisplay(displayId = DISPLAY_4_NO_SYSTEM_DECOR), never())

                .start()

            assertThat(fakeLightBarStore.perDisplayMocks.keys)

                .containsExactly(DEFAULT_DISPLAY, DISPLAY_2)

        }



    companion object {

        const val DISPLAY_1 = 1

        const val DISPLAY_2 = 2

        const val DISPLAY_3 = 3

        const val DISPLAY_4_NO_SYSTEM_DECOR = 4

    }

}

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/data/repository/LightBarControllerStoreImplTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -65,11 +65,11 @@ class LightBarControllerStoreImplTest : SysuiTestCase() { 
        }



    @Test

    fun displayRemoved_stopsInstance() =

    fun systemDecorationRemovedEvent_stopsInstance() =

        testScope.runTest {

            val instance = underTest.forDisplay(DEFAULT_DISPLAY)!!



            fakeDisplayRepository.removeDisplay(DEFAULT_DISPLAY)

            fakeDisplayRepository.triggerRemoveSystemDecorationEvent(DEFAULT_DISPLAY)



            verify(instance).stop()

        }

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/data/repository/MultiDisplayDarkIconDispatcherStoreTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -62,11 +62,11 @@ class MultiDisplayDarkIconDispatcherStoreTest : SysuiTestCase() { 
        }



    @Test

    fun displayRemoved_stopsInstance() =

    fun systemDecorationRemovedEvent_stopsInstance() =

        testScope.runTest {

            val instance = underTest.forDisplay(DEFAULT_DISPLAY)!!



            fakeDisplayRepository.removeDisplay(DEFAULT_DISPLAY)

            fakeDisplayRepository.triggerRemoveSystemDecorationEvent(DEFAULT_DISPLAY)



            verify(instance).stop()

        }

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/data/repository/MultiDisplayStatusBarContentInsetsProviderStoreTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -65,11 +65,11 @@ class MultiDisplayStatusBarContentInsetsProviderStoreTest : SysuiTestCase() { 
        }



    @Test

    fun displayRemoved_stopsInstance() =

    fun systemDecorationRemovedEvent_stopsInstance() =

        testScope.runTest {

            val instance = underTest.forDisplay(DEFAULT_DISPLAY)!!



            fakeDisplayRepository.removeDisplay(DEFAULT_DISPLAY)

            fakeDisplayRepository.triggerRemoveSystemDecorationEvent(DEFAULT_DISPLAY)



            verify(instance).stop()

        }