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

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

Merge "Fix settings button opening settings on wrong display" into main

parents 746e5a94 782d430d

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/LegacyActivityStarterInternalImplTest.kt

+4 −2
Original line number Original line Diff line number Diff line
@@ -49,6 +49,7 @@ import com.android.systemui.shade.ShadeController 
import com.android.systemui.shade.data.repository.FakeShadeRepository

import com.android.systemui.shade.data.repository.FakeShadeRepository

import com.android.systemui.shade.data.repository.ShadeAnimationRepository

import com.android.systemui.shade.data.repository.ShadeAnimationRepository

import com.android.systemui.shade.domain.interactor.ShadeAnimationInteractorLegacyImpl

import com.android.systemui.shade.domain.interactor.ShadeAnimationInteractorLegacyImpl

import com.android.systemui.shade.domain.interactor.ShadeDialogContextInteractor

import com.android.systemui.shared.Flags as SharedFlags

import com.android.systemui.shared.Flags as SharedFlags

import com.android.systemui.statusbar.CommandQueue

import com.android.systemui.statusbar.CommandQueue

import com.android.systemui.statusbar.NotificationLockscreenUserManager

import com.android.systemui.statusbar.NotificationLockscreenUserManager
@@ -96,6 +97,7 @@ class LegacyActivityStarterInternalImplTest : SysuiTestCase() { 
    @Mock private lateinit var commandQueue: CommandQueue

    @Mock private lateinit var commandQueue: CommandQueue

    @Mock private lateinit var statusBarKeyguardViewManager: StatusBarKeyguardViewManager

    @Mock private lateinit var statusBarKeyguardViewManager: StatusBarKeyguardViewManager

    @Mock private lateinit var activityTransitionAnimator: ActivityTransitionAnimator

    @Mock private lateinit var activityTransitionAnimator: ActivityTransitionAnimator

    @Mock private lateinit var shadeDialogContextInteractor: ShadeDialogContextInteractor

    @Mock private lateinit var lockScreenUserManager: NotificationLockscreenUserManager

    @Mock private lateinit var lockScreenUserManager: NotificationLockscreenUserManager

    @Mock private lateinit var statusBarWindowController: StatusBarWindowController

    @Mock private lateinit var statusBarWindowController: StatusBarWindowController

    @Mock private lateinit var statusBarWindowControllerStore: StatusBarWindowControllerStore

    @Mock private lateinit var statusBarWindowControllerStore: StatusBarWindowControllerStore
@@ -132,8 +134,7 @@ class LegacyActivityStarterInternalImplTest : SysuiTestCase() { 
                statusBarKeyguardViewManagerLazy = { statusBarKeyguardViewManager },

                statusBarKeyguardViewManagerLazy = { statusBarKeyguardViewManager },

                notifShadeWindowControllerLazy = { notifShadeWindowController },

                notifShadeWindowControllerLazy = { notifShadeWindowController },

                activityTransitionAnimator = activityTransitionAnimator,

                activityTransitionAnimator = activityTransitionAnimator,

                context = context,

                contextInteractor = shadeDialogContextInteractor,

                displayId = DISPLAY_ID,

                lockScreenUserManager = lockScreenUserManager,

                lockScreenUserManager = lockScreenUserManager,

                statusBarWindowControllerStore = statusBarWindowControllerStore,

                statusBarWindowControllerStore = statusBarWindowControllerStore,

                wakefulnessLifecycle = wakefulnessLifecycle,

                wakefulnessLifecycle = wakefulnessLifecycle,
@@ -151,6 +152,7 @@ class LegacyActivityStarterInternalImplTest : SysuiTestCase() { 
        `when`(communalSceneInteractor.isCommunalVisible).thenReturn(MutableStateFlow(false))

        `when`(communalSceneInteractor.isCommunalVisible).thenReturn(MutableStateFlow(false))

        `when`(communalSceneInteractor.isIdleOnCommunal).thenReturn(MutableStateFlow(false))

        `when`(communalSceneInteractor.isIdleOnCommunal).thenReturn(MutableStateFlow(false))

        `when`(communalSceneInteractor.isLaunchingWidget).thenReturn(MutableStateFlow(false))

        `when`(communalSceneInteractor.isLaunchingWidget).thenReturn(MutableStateFlow(false))

        `when`(shadeDialogContextInteractor.context).thenReturn(context)

    }

    }





    @EnableFlags(

    @EnableFlags(

packages/SystemUI/src/com/android/systemui/statusbar/phone/ActivityStarterInternalImpl.kt

+8 −3
Original line number Original line Diff line number Diff line
@@ -42,7 +42,6 @@ import com.android.systemui.camera.CameraIntents 
import com.android.systemui.communal.domain.interactor.CommunalSceneInteractor

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

import com.android.systemui.communal.shared.model.CommunalScenes

import com.android.systemui.communal.shared.model.CommunalScenes

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.DisplayId

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

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

import com.android.systemui.deviceentry.domain.interactor.DeviceEntryInteractor

import com.android.systemui.deviceentry.domain.interactor.DeviceEntryInteractor

import com.android.systemui.keyguard.KeyguardViewMediator

import com.android.systemui.keyguard.KeyguardViewMediator
@@ -54,6 +53,7 @@ import com.android.systemui.res.R 
import com.android.systemui.scene.shared.flag.SceneContainerFlag

import com.android.systemui.scene.shared.flag.SceneContainerFlag

import com.android.systemui.shade.ShadeController

import com.android.systemui.shade.ShadeController

import com.android.systemui.shade.domain.interactor.ShadeAnimationInteractor

import com.android.systemui.shade.domain.interactor.ShadeAnimationInteractor

import com.android.systemui.shade.domain.interactor.ShadeDialogContextInteractor

import com.android.systemui.statusbar.CommandQueue

import com.android.systemui.statusbar.CommandQueue

import com.android.systemui.statusbar.NotificationLockscreenUserManager

import com.android.systemui.statusbar.NotificationLockscreenUserManager

import com.android.systemui.statusbar.NotificationShadeWindowController

import com.android.systemui.statusbar.NotificationShadeWindowController
@@ -80,12 +80,11 @@ constructor( 
    private val statusBarKeyguardViewManagerLazy: Lazy<StatusBarKeyguardViewManager>,

    private val statusBarKeyguardViewManagerLazy: Lazy<StatusBarKeyguardViewManager>,

    private val keyguardInteractor: KeyguardInteractor,

    private val keyguardInteractor: KeyguardInteractor,

    private val centralSurfacesOptLazy: Lazy<Optional<CentralSurfaces>>,

    private val centralSurfacesOptLazy: Lazy<Optional<CentralSurfaces>>,

    private val context: Context,

    private val contextInteractor: ShadeDialogContextInteractor,

    @Main private val resources: Resources,

    @Main private val resources: Resources,

    private val selectedUserInteractor: SelectedUserInteractor,

    private val selectedUserInteractor: SelectedUserInteractor,

    private val deviceEntryInteractor: DeviceEntryInteractor,

    private val deviceEntryInteractor: DeviceEntryInteractor,

    private val activityTransitionAnimator: ActivityTransitionAnimator,

    private val activityTransitionAnimator: ActivityTransitionAnimator,

    @DisplayId private val displayId: Int,

    private val deviceProvisioningInteractor: DeviceProvisioningInteractor,

    private val deviceProvisioningInteractor: DeviceProvisioningInteractor,

    private val activityIntentHelper: ActivityIntentHelper,

    private val activityIntentHelper: ActivityIntentHelper,

    private val keyguardTransitionInteractor: KeyguardTransitionInteractor,

    private val keyguardTransitionInteractor: KeyguardTransitionInteractor,
@@ -103,6 +102,12 @@ constructor( 
    private val centralSurfaces: CentralSurfaces?

    private val centralSurfaces: CentralSurfaces?

        get() = centralSurfacesOptLazy.get().getOrNull()

        get() = centralSurfacesOptLazy.get().getOrNull()





    private val context: Context

        get() = contextInteractor.context



    private val displayId: Int

        get() = context.displayId



    override fun registerTransition(

    override fun registerTransition(

        cookie: ActivityTransitionAnimator.TransitionCookie,

        cookie: ActivityTransitionAnimator.TransitionCookie,

        controllerFactory: ActivityTransitionAnimator.ControllerFactory,

        controllerFactory: ActivityTransitionAnimator.ControllerFactory,

packages/SystemUI/src/com/android/systemui/statusbar/phone/LegacyActivityStarterInternalImpl.kt

+8 −3
Original line number Original line Diff line number Diff line
@@ -42,7 +42,6 @@ import com.android.systemui.camera.CameraIntents 
import com.android.systemui.communal.domain.interactor.CommunalSceneInteractor

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

import com.android.systemui.communal.domain.interactor.CommunalSettingsInteractor

import com.android.systemui.communal.domain.interactor.CommunalSettingsInteractor

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.DisplayId

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

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

import com.android.systemui.keyguard.KeyguardViewMediator

import com.android.systemui.keyguard.KeyguardViewMediator

import com.android.systemui.keyguard.WakefulnessLifecycle

import com.android.systemui.keyguard.WakefulnessLifecycle
@@ -51,6 +50,7 @@ import com.android.systemui.res.R 
import com.android.systemui.settings.UserTracker

import com.android.systemui.settings.UserTracker

import com.android.systemui.shade.ShadeController

import com.android.systemui.shade.ShadeController

import com.android.systemui.shade.domain.interactor.ShadeAnimationInteractor

import com.android.systemui.shade.domain.interactor.ShadeAnimationInteractor

import com.android.systemui.shade.domain.interactor.ShadeDialogContextInteractor

import com.android.systemui.statusbar.CommandQueue

import com.android.systemui.statusbar.CommandQueue

import com.android.systemui.statusbar.NotificationLockscreenUserManager

import com.android.systemui.statusbar.NotificationLockscreenUserManager

import com.android.systemui.statusbar.NotificationShadeWindowController

import com.android.systemui.statusbar.NotificationShadeWindowController
@@ -84,8 +84,7 @@ constructor( 
    private val statusBarKeyguardViewManagerLazy: Lazy<StatusBarKeyguardViewManager>,

    private val statusBarKeyguardViewManagerLazy: Lazy<StatusBarKeyguardViewManager>,

    private val notifShadeWindowControllerLazy: Lazy<NotificationShadeWindowController>,

    private val notifShadeWindowControllerLazy: Lazy<NotificationShadeWindowController>,

    private val activityTransitionAnimator: ActivityTransitionAnimator,

    private val activityTransitionAnimator: ActivityTransitionAnimator,

    private val context: Context,

    private val contextInteractor: ShadeDialogContextInteractor,

    @DisplayId private val displayId: Int,

    private val lockScreenUserManager: NotificationLockscreenUserManager,

    private val lockScreenUserManager: NotificationLockscreenUserManager,

    private val statusBarWindowControllerStore: StatusBarWindowControllerStore,

    private val statusBarWindowControllerStore: StatusBarWindowControllerStore,

    private val wakefulnessLifecycle: WakefulnessLifecycle,

    private val wakefulnessLifecycle: WakefulnessLifecycle,
@@ -100,6 +99,12 @@ constructor( 
    private val centralSurfaces: CentralSurfaces?

    private val centralSurfaces: CentralSurfaces?

        get() = centralSurfacesOptLazy.get().getOrNull()

        get() = centralSurfacesOptLazy.get().getOrNull()





    private val context: Context

        get() = contextInteractor.context



    private val displayId: Int

        get() = context.displayId



    override fun registerTransition(

    override fun registerTransition(

        cookie: ActivityTransitionAnimator.TransitionCookie,

        cookie: ActivityTransitionAnimator.TransitionCookie,

        controllerFactory: ActivityTransitionAnimator.ControllerFactory,

        controllerFactory: ActivityTransitionAnimator.ControllerFactory,