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

Commit bb356bb8 authored by Sergey Pinkevich's avatar Sergey Pinkevich
Browse files

Use getter within DesktopFirstRepository instead of field 

The issue is that we previously copied an empty map from internal field, so each time we request this field we get an empty map

Bug: 441574781
Flag: com.android.systemui.shade_app_launch_animation_skip_in_desktop
Test: atest com.android.systemui.statusbar.phone.LegacyActivityStarterInternalImplTest com.android.systemui.animation.ActivityTransitionAnimatorTest com.android.systemui.statusbar.phone.StatusBarNotificationActivityStarterTest

Change-Id: I01f69eedd8fcc458a98e4ad5c6f702a0c2d630b2
parent a6f51b89

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

+17 −28
Original line number Diff line number Diff line
@@ -125,8 +125,6 @@ class LegacyActivityStarterInternalImplTest : SysuiTestCase() { 
    private val mainExecutor = FakeExecutor(FakeSystemClock())

    private val shadeAnimationInteractor =

        ShadeAnimationInteractorLegacyImpl(ShadeAnimationRepository(), FakeShadeRepository())

    private val desktopFirstStateForDefaultDisplay = mutableMapOf(DISPLAY_ID to true)

    private val nonDesktopFirstStateForDefaultDisplay = mutableMapOf(DISPLAY_ID to false)



    @Before

    fun setUp() {
@@ -169,8 +167,7 @@ class LegacyActivityStarterInternalImplTest : SysuiTestCase() { 
        `when`(communalSceneInteractor.isIdleOnCommunal).thenReturn(MutableStateFlow(false))

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

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

        `when`(mDesktopFirstRepository.isDisplayDesktopFirst)

            .thenReturn(nonDesktopFirstStateForDefaultDisplay)

        `when`(mDesktopFirstRepository.isDisplayDesktopFirst(DISPLAY_ID)).thenReturn(false)

    }



    @Test
@@ -1012,8 +1009,7 @@ class LegacyActivityStarterInternalImplTest : SysuiTestCase() { 
    @Test

    fun startActivity_skipAnimInDesktop_flagEnabled_inDesktop_desktopFirst_noAnimate() {

        setupDesktopMode(enabled = true)

        `when`(mDesktopFirstRepository.isDisplayDesktopFirst)

            .thenReturn(desktopFirstStateForDefaultDisplay)

        `when`(mDesktopFirstRepository.isDisplayDesktopFirst(DISPLAY_ID)).thenReturn(true)

        val (controller, pendingIntent) = setupLaunchWithOccludedKeyguard()



        underTest.startPendingIntentDismissingKeyguard(
@@ -1030,7 +1026,7 @@ class LegacyActivityStarterInternalImplTest : SysuiTestCase() { 
            .startPendingIntentWithAnimation(

                nullable(ActivityTransitionAnimator.Controller::class.java),

                eq(kosmos.testScope),

                /* animate */ eq(false),

                /* animate= */ eq(false),

                eq(false),

                eq(true),

                any(),
@@ -1044,8 +1040,7 @@ class LegacyActivityStarterInternalImplTest : SysuiTestCase() { 
    @Test

    fun startActivity_skipAnimInDesktop_flagEnabled_inDesktop_notDesktopFirst_noAnimate() {

        setupDesktopMode(enabled = true)

        `when`(mDesktopFirstRepository.isDisplayDesktopFirst)

            .thenReturn(nonDesktopFirstStateForDefaultDisplay)

        `when`(mDesktopFirstRepository.isDisplayDesktopFirst(DISPLAY_ID)).thenReturn(false)

        val (controller, pendingIntent) = setupLaunchWithOccludedKeyguard()



        underTest.startPendingIntentDismissingKeyguard(
@@ -1062,7 +1057,7 @@ class LegacyActivityStarterInternalImplTest : SysuiTestCase() { 
            .startPendingIntentWithAnimation(

                nullable(ActivityTransitionAnimator.Controller::class.java),

                eq(kosmos.testScope),

                /* animate */ eq(false),

                /* animate= */ eq(false),

                eq(false),

                eq(true),

                any(),
@@ -1074,8 +1069,7 @@ class LegacyActivityStarterInternalImplTest : SysuiTestCase() { 
    @Test

    fun startActivity_skipAnimInDesktop_flagDisabled_inDesktop_desktopFirst_doAnimate() {

        setupDesktopMode(enabled = true)

        `when`(mDesktopFirstRepository.isDisplayDesktopFirst)

            .thenReturn(desktopFirstStateForDefaultDisplay)

        `when`(mDesktopFirstRepository.isDisplayDesktopFirst(DISPLAY_ID)).thenReturn(true)

        val (controller, pendingIntent) = setupLaunchWithOccludedKeyguard()



        underTest.startPendingIntentDismissingKeyguard(
@@ -1092,7 +1086,7 @@ class LegacyActivityStarterInternalImplTest : SysuiTestCase() { 
            .startPendingIntentWithAnimation(

                nullable(ActivityTransitionAnimator.Controller::class.java),

                eq(kosmos.testScope),

                /* animate */ eq(true),

                /* animate= */ eq(true),

                eq(false),

                eq(true),

                any(),
@@ -1104,8 +1098,7 @@ class LegacyActivityStarterInternalImplTest : SysuiTestCase() { 
    @Test

    fun startActivity_skipAnimInDesktop_flagDisabled_inDesktop_noDesktopFirst_doAnimate() {

        setupDesktopMode(enabled = true)

        `when`(mDesktopFirstRepository.isDisplayDesktopFirst)

            .thenReturn(nonDesktopFirstStateForDefaultDisplay)

        `when`(mDesktopFirstRepository.isDisplayDesktopFirst(DISPLAY_ID)).thenReturn(false)

        val (controller, pendingIntent) = setupLaunchWithOccludedKeyguard()



        underTest.startPendingIntentDismissingKeyguard(
@@ -1122,7 +1115,7 @@ class LegacyActivityStarterInternalImplTest : SysuiTestCase() { 
            .startPendingIntentWithAnimation(

                nullable(ActivityTransitionAnimator.Controller::class.java),

                eq(kosmos.testScope),

                /* animate */ eq(true),

                /* animate= */ eq(true),

                eq(false),

                eq(true),

                any(),
@@ -1136,8 +1129,7 @@ class LegacyActivityStarterInternalImplTest : SysuiTestCase() { 
    @Test

    fun startActivity_skipAnimInDesktop_flagEnabled_notInDesktop_desktopFirst_notAnimate() {

        setupDesktopMode(enabled = false)

        `when`(mDesktopFirstRepository.isDisplayDesktopFirst)

            .thenReturn(desktopFirstStateForDefaultDisplay)

        `when`(mDesktopFirstRepository.isDisplayDesktopFirst(DISPLAY_ID)).thenReturn(true)

        val (controller, pendingIntent) = setupLaunchWithOccludedKeyguard()



        underTest.startPendingIntentDismissingKeyguard(
@@ -1154,7 +1146,7 @@ class LegacyActivityStarterInternalImplTest : SysuiTestCase() { 
            .startPendingIntentWithAnimation(

                nullable(ActivityTransitionAnimator.Controller::class.java),

                eq(kosmos.testScope),

                /* animate */ eq(false),

                /* animate= */ eq(false),

                eq(false),

                eq(true),

                any(),
@@ -1168,8 +1160,7 @@ class LegacyActivityStarterInternalImplTest : SysuiTestCase() { 
    @Test

    fun startActivity_skipAnimInDesktop_flagEnabled_notInDesktop_notDesktopFirst_doAnimate() {

        setupDesktopMode(enabled = false)

        `when`(mDesktopFirstRepository.isDisplayDesktopFirst)

            .thenReturn(nonDesktopFirstStateForDefaultDisplay)

        `when`(mDesktopFirstRepository.isDisplayDesktopFirst(DISPLAY_ID)).thenReturn(false)

        val (controller, pendingIntent) = setupLaunchWithOccludedKeyguard()



        underTest.startPendingIntentDismissingKeyguard(
@@ -1186,7 +1177,7 @@ class LegacyActivityStarterInternalImplTest : SysuiTestCase() { 
            .startPendingIntentWithAnimation(

                nullable(ActivityTransitionAnimator.Controller::class.java),

                eq(kosmos.testScope),

                /* animate */ eq(true),

                /* animate= */ eq(true),

                eq(false),

                eq(true),

                any(),
@@ -1198,8 +1189,7 @@ class LegacyActivityStarterInternalImplTest : SysuiTestCase() { 
    @Test

    fun startActivity_skipAnimInDesktop_flagDisabled_notInDesktop_desktopFirst_doAnimate() {

        setupDesktopMode(enabled = false)

        `when`(mDesktopFirstRepository.isDisplayDesktopFirst)

            .thenReturn(desktopFirstStateForDefaultDisplay)

        `when`(mDesktopFirstRepository.isDisplayDesktopFirst(DISPLAY_ID)).thenReturn(true)

        val (controller, pendingIntent) = setupLaunchWithOccludedKeyguard()



        underTest.startPendingIntentDismissingKeyguard(
@@ -1216,7 +1206,7 @@ class LegacyActivityStarterInternalImplTest : SysuiTestCase() { 
            .startPendingIntentWithAnimation(

                nullable(ActivityTransitionAnimator.Controller::class.java),

                eq(kosmos.testScope),

                /* animate */ eq(true),

                /* animate= */ eq(true),

                eq(false),

                eq(true),

                any(),
@@ -1228,8 +1218,7 @@ class LegacyActivityStarterInternalImplTest : SysuiTestCase() { 
    @Test

    fun startActivity_skipAnimInDesktop_flagDisabled_notInDesktop_notDesktopFirst_doAnimate() {

        setupDesktopMode(enabled = false)

        `when`(mDesktopFirstRepository.isDisplayDesktopFirst)

            .thenReturn(nonDesktopFirstStateForDefaultDisplay)

        `when`(mDesktopFirstRepository.isDisplayDesktopFirst(DISPLAY_ID)).thenReturn(false)

        val (controller, pendingIntent) = setupLaunchWithOccludedKeyguard()



        underTest.startPendingIntentDismissingKeyguard(
@@ -1246,7 +1235,7 @@ class LegacyActivityStarterInternalImplTest : SysuiTestCase() { 
            .startPendingIntentWithAnimation(

                nullable(ActivityTransitionAnimator.Controller::class.java),

                eq(kosmos.testScope),

                /* animate */ eq(true),

                /* animate= */ eq(true),

                eq(false),

                eq(true),

                any(),

packages/SystemUI/src/com/android/systemui/desktop/DesktopFirstRepository.kt

+8 −1
Original line number Diff line number Diff line
@@ -36,12 +36,19 @@ class DesktopFirstRepository @Inject constructor(desktopMode: Optional<DesktopMo 
    DesktopFirstListener {



    private val _isDisplayDesktopFirst: MutableMap<Int, Boolean> = mutableMapOf()

    val isDisplayDesktopFirst: Map<Int, Boolean> = _isDisplayDesktopFirst.toMap()



    init {

        desktopMode.ifPresent { desktopMode.get().registerDesktopFirstListener(this) }

    }



    /**

     * Checks if the display with the given [displayId] is in "Desktop First" mode.

     *

     * In "Desktop First" mode, new apps on the display open in freeform mode by default. This

     * function retrieves the tracked state for the specified display.

     */

    fun isDisplayDesktopFirst(displayId: Int) = _isDisplayDesktopFirst[displayId] == true



    override fun onStateChanged(displayId: Int, isDesktopFirstEnabled: Boolean) {

        _isDisplayDesktopFirst[displayId] = isDesktopFirstEnabled

    }

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

+9 −2
Original line number Diff line number Diff line
@@ -120,7 +120,14 @@ constructor( 
        get() = currentShadeContext.displayId



    private val shadeSysUiState: Long

        get() = perDisplaySysUiStateRepository[currentShadeDisplayId]?.flags ?: 0

        get() {

            val sysUiState = perDisplaySysUiStateRepository[currentShadeDisplayId]

            if (sysUiState == null) {

                Log.w(TAG, "SysUiState is null for display $currentShadeDisplayId")

                return 0L

            }

            return sysUiState.flags

        }



    private val isInDesktopModeOnCurrentShadeDisplay: Boolean

        get() = (shadeSysUiState and SYSUI_STATE_FREEFORM_ACTIVE_IN_DESKTOP_MODE) != 0L
@@ -665,7 +672,7 @@ constructor( 
        if (

            shadeAppLaunchAnimationSkipInDesktop() &&

                (isInDesktopModeOnCurrentShadeDisplay ||

                    desktopFirstRepository.isDisplayDesktopFirst[currentShadeDisplayId] == true)

                    desktopFirstRepository.isDisplayDesktopFirst(currentShadeDisplayId))

        ) {

            return false

        }

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

+9 −2
Original line number Diff line number Diff line
@@ -116,7 +116,14 @@ constructor( 
        get() = currentShadeContext.displayId



    private val shadeSysUiState: Long

        get() = perDisplaySysUiStateRepository[currentShadeDisplayId]?.flags ?: 0

        get() {

            val sysUiState = perDisplaySysUiStateRepository[currentShadeDisplayId]

            if (sysUiState == null) {

                Log.w(TAG, "SysUiState is null for display $currentShadeDisplayId")

                return 0L

            }

            return sysUiState.flags

        }



    private val isInDesktopModeOnCurrentShadeDisplay: Boolean

        get() = (shadeSysUiState and SYSUI_STATE_FREEFORM_ACTIVE_IN_DESKTOP_MODE) != 0L
@@ -802,7 +809,7 @@ constructor( 
        if (

            shadeAppLaunchAnimationSkipInDesktop() &&

                (isInDesktopModeOnCurrentShadeDisplay ||

                    desktopFirstRepository.isDisplayDesktopFirst[currentShadeDisplayId] == true)

                    desktopFirstRepository.isDisplayDesktopFirst(currentShadeDisplayId))

        ) {

            return false

        }