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

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

Merge "Use display specific status bar window state" into main

parents d3429372 193d9b87

packages/SystemUI/multivalentTests/src/com/android/systemui/ambient/statusbar/ui/AmbientStatusBarViewControllerTest.java

+12 −2
Original line number Diff line number Diff line
@@ -43,7 +43,9 @@ import android.view.View; 
import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;



import com.android.app.displaylib.PerDisplayRepository;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.display.dagger.SystemUIDisplaySubcomponent;

import com.android.systemui.dreams.DreamOverlayNotificationCountProvider;

import com.android.systemui.dreams.DreamOverlayStateController;

import com.android.systemui.dreams.DreamOverlayStatusBarItemsProvider;
@@ -103,6 +105,9 @@ public class AmbientStatusBarViewControllerTest extends SysuiTestCase { 
    DreamOverlayNotificationCountProvider mDreamOverlayNotificationCountProvider;

    @Mock

    StatusBarWindowStateController mStatusBarWindowStateController;

    @Mock private SystemUIDisplaySubcomponent mSystemUIDisplaySubcomponent;

    @Mock

    private PerDisplayRepository<SystemUIDisplaySubcomponent> mPerDisplaySubcomponentRepository;

    @Mock

    DreamOverlayStatusBarItemsProvider mDreamOverlayStatusBarItemsProvider;

    @Mock
@@ -143,6 +148,11 @@ public class AmbientStatusBarViewControllerTest extends SysuiTestCase { 
        doCallRealMethod().when(mView).getVisibility();

        when(mUserTracker.getUserId()).thenReturn(ActivityManager.getCurrentUser());



        when(mSystemUIDisplaySubcomponent.getStatusBarWindowStateController())

                .thenReturn(mStatusBarWindowStateController);

        when(mPerDisplaySubcomponentRepository.getOrDefault(anyInt()))

                .thenReturn(mSystemUIDisplaySubcomponent);

        when(mView.getContext()).thenReturn(getContext());

        mController = new AmbientStatusBarViewController(

                mView,

                mResources,
@@ -153,7 +163,7 @@ public class AmbientStatusBarViewControllerTest extends SysuiTestCase { 
                mSensorPrivacyController,

                Optional.of(mDreamOverlayNotificationCountProvider),

                mZenModeController,

                mStatusBarWindowStateController,

                mPerDisplaySubcomponentRepository,

                mDreamOverlayStatusBarItemsProvider,

                mDreamOverlayStateController,

                mUserTracker,
@@ -333,7 +343,7 @@ public class AmbientStatusBarViewControllerTest extends SysuiTestCase { 
                mSensorPrivacyController,

                Optional.empty(),

                mZenModeController,

                mStatusBarWindowStateController,

                mPerDisplaySubcomponentRepository,

                mDreamOverlayStatusBarItemsProvider,

                mDreamOverlayStateController,

                mUserTracker,

packages/SystemUI/multivalentTests/src/com/android/systemui/display/data/repository/PerDisplayInstanceRepositoryImplTest.kt

+47 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import com.android.systemui.dump.dumpManager 
import com.android.systemui.kosmos.testScope

import com.android.systemui.kosmos.useUnconfinedTestDispatcher

import com.android.systemui.testKosmos

import com.android.systemui.util.containsExactly

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

import kotlinx.coroutines.runBlocking

import kotlinx.coroutines.test.runTest
@@ -163,6 +162,53 @@ class PerDisplayInstanceRepositoryImplTest : SysuiTestCase() { 
            assertThat(displayIds).containsExactly(DEFAULT_DISPLAY_ID, NON_DEFAULT_DISPLAY_ID)

        }



    @Test

    fun getOrDefault_existingDisplay_returnsCorrectInstance() =

        testScope.runTest {

            val defaultInstance = underTest[DEFAULT_DISPLAY_ID]

            val nonDefaultInstance = underTest.getOrDefault(NON_DEFAULT_DISPLAY_ID)



            // The correct instance for the non-default display should be returned

            assertThat(nonDefaultInstance.displayId).isEqualTo(NON_DEFAULT_DISPLAY_ID)



            // It should NOT be the default instance

            assertThat(nonDefaultInstance).isNotSameInstanceAs(defaultInstance)

        }



    @Test

    fun getOrDefault_nonExistingDisplay_returnsDefaultInstance() =

        testScope.runTest {

            // First, get the default instance so we have something to compare against.

            val defaultInstance = underTest.getOrDefault(DEFAULT_DISPLAY_ID)



            // Now, request a display that does not exist.

            val instance = underTest.getOrDefault(NON_EXISTING_DISPLAY_ID)



            // It should fall back to returning the default instance.

            assertThat(instance).isSameInstanceAs(defaultInstance)

        }



    @Test

    fun getOrDefault_disallowedByLifecycleManager_returnsDefaultInstance() =

        testScope.runTest {

            val underTestWithLifecycle =

                kosmos.createPerDisplayInstanceRepository(

                    overrideLifecycleManager = lifecycleManager

                )



            // Allow only the default display, even though the non-default one exists.

            lifecycleManager.displayIds.value = setOf(DEFAULT_DISPLAY_ID)



            // Get the default instance to have a reference.

            val defaultInstance = underTestWithLifecycle.getOrDefault(DEFAULT_DISPLAY_ID)



            // Request the non-default display, which is disallowed by the manager.

            val instance = underTestWithLifecycle.getOrDefault(NON_DEFAULT_DISPLAY_ID)



            // It should fall back to the default instance.

            assertThat(instance).isSameInstanceAs(defaultInstance)

        }



    private fun createDisplay(displayId: Int): Display =

        display(type = Display.TYPE_INTERNAL, id = displayId)

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

+12 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.view.accessibility.AccessibilityEvent 
import android.widget.FrameLayout

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

import androidx.test.filters.SmallTest

import com.android.app.displaylib.PerDisplayRepository

import com.android.keyguard.KeyguardSecurityContainerController

import com.android.keyguard.dagger.KeyguardBouncerComponent

import com.android.systemui.Flags as AConfigFlags
@@ -31,6 +32,7 @@ import com.android.systemui.SysuiTestCase 
import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor

import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor

import com.android.systemui.classifier.FalsingCollectorFake

import com.android.systemui.display.dagger.SystemUIDisplaySubcomponent

import com.android.systemui.dock.DockManager

import com.android.systemui.dump.DumpManager

import com.android.systemui.flags.FakeFeatureFlags
@@ -87,6 +89,7 @@ import org.junit.runner.RunWith 
import org.mockito.ArgumentCaptor

import org.mockito.Captor

import org.mockito.Mock

import org.mockito.Mockito.anyInt

import org.mockito.Mockito.never

import org.mockito.Mockito.spy

import org.mockito.Mockito.verify
@@ -121,6 +124,10 @@ class NotificationShadeWindowViewTest : SysuiTestCase() { 
    private lateinit var notificationStackScrollLayoutController:

        NotificationStackScrollLayoutController

    @Mock private lateinit var statusBarWindowStateController: StatusBarWindowStateController

    @Mock private lateinit var systemUIDisplaySubcomponent: SystemUIDisplaySubcomponent

    @Mock

    private lateinit var perDisplaySubcomponentRepository:

        PerDisplayRepository<SystemUIDisplaySubcomponent>

    @Mock

    private lateinit var lockscreenShadeTransitionController: LockscreenShadeTransitionController

    @Mock private lateinit var keyguardUnlockAnimationController: KeyguardUnlockAnimationController
@@ -174,6 +181,10 @@ class NotificationShadeWindowViewTest : SysuiTestCase() { 
        whenever(dockManager.isDocked).thenReturn(false)

        whenever(keyguardTransitionInteractor.transition(Edge.create(LOCKSCREEN, DREAMING)))

            .thenReturn(emptyFlow())

        whenever(systemUIDisplaySubcomponent.statusBarWindowStateController)

            .thenReturn(statusBarWindowStateController)

        whenever(perDisplaySubcomponentRepository.getOrDefault(anyInt()))

            .thenReturn(systemUIDisplaySubcomponent)



        val featureFlags = FakeFeatureFlags()

        featureFlags.set(Flags.SPLIT_SHADE_SUBPIXEL_OPTIMIZATION, true)
@@ -199,7 +210,7 @@ class NotificationShadeWindowViewTest : SysuiTestCase() { 
                panelExpansionInteractor,

                ShadeExpansionStateManager(),

                notificationStackScrollLayoutController,

                statusBarWindowStateController,

                perDisplaySubcomponentRepository,

                centralSurfaces,

                dozeServiceHost,

                dozeScrimController,

packages/SystemUI/src/com/android/systemui/ambient/statusbar/ui/AmbientStatusBarViewController.java

+8 −2
Original line number Diff line number Diff line
@@ -32,10 +32,12 @@ import androidx.annotation.Nullable; 
import androidx.annotation.VisibleForTesting;

import androidx.compose.ui.platform.ComposeView;



import com.android.app.displaylib.PerDisplayRepository;

import com.android.systemui.ambient.statusbar.shared.flag.OngoingActivityChipsOnDream;

import com.android.systemui.ambient.statusbar.ui.binder.AmbientStatusBarViewBinder;

import com.android.systemui.communal.domain.interactor.CommunalSceneInteractor;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.display.dagger.SystemUIDisplaySubcomponent;

import com.android.systemui.dreams.DreamLogger;

import com.android.systemui.dreams.DreamOverlayNotificationCountProvider;

import com.android.systemui.dreams.DreamOverlayStateController;
@@ -72,6 +74,7 @@ import java.util.stream.Collectors; 


import javax.inject.Inject;





/**

 * View controller for {@link AmbientStatusBarView}.

 */
@@ -160,7 +163,7 @@ public class AmbientStatusBarViewController extends ViewController<AmbientStatus 
            IndividualSensorPrivacyController sensorPrivacyController,

            Optional<DreamOverlayNotificationCountProvider> dreamOverlayNotificationCountProvider,

            ZenModeController zenModeController,

            StatusBarWindowStateController statusBarWindowStateController,

            PerDisplayRepository<SystemUIDisplaySubcomponent> perDisplaySubcomponentRepository,

            DreamOverlayStatusBarItemsProvider statusBarItemsProvider,

            DreamOverlayStateController dreamOverlayStateController,

            UserTracker userTracker,
@@ -178,7 +181,10 @@ public class AmbientStatusBarViewController extends ViewController<AmbientStatus 
        mDateFormatUtil = dateFormatUtil;

        mSensorPrivacyController = sensorPrivacyController;

        mDreamOverlayNotificationCountProvider = dreamOverlayNotificationCountProvider;

        mStatusBarWindowStateController = statusBarWindowStateController;

        int displayId = view.getContext().getDisplayId();

        SystemUIDisplaySubcomponent displaySubComponent =

                perDisplaySubcomponentRepository.getOrDefault(displayId);

        mStatusBarWindowStateController = displaySubComponent.getStatusBarWindowStateController();

        mStatusBarItemsProvider = statusBarItemsProvider;

        mZenModeController = zenModeController;

        mDreamOverlayStateController = dreamOverlayStateController;

packages/SystemUI/src/com/android/systemui/display/dagger/SystemUIDisplaySubcomponent.kt

+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import com.android.systemui.display.dagger.SystemUIDisplaySubcomponent.PerDispla 
import com.android.systemui.display.data.repository.DisplayStateRepository

import com.android.systemui.display.domain.interactor.DisplayStateInteractor

import com.android.systemui.statusbar.domain.interactor.StatusBarIconRefreshInteractor

import com.android.systemui.statusbar.window.StatusBarWindowStateController

import dagger.BindsInstance

import dagger.Subcomponent

import javax.inject.Qualifier
@@ -49,6 +50,8 @@ interface SystemUIDisplaySubcomponent { 


    @get:DisplayAware val lifecycleListeners: Set<LifecycleListener>



    @get:DisplayAware val statusBarWindowStateController: StatusBarWindowStateController



    @Subcomponent.Factory

    interface Factory {

        fun create(@BindsInstance @DisplayId displayId: Int): SystemUIDisplaySubcomponent