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

Commit aaaf83e8 authored by Beverly's avatar Beverly
Browse files

Add udfps_refactor + refactor_keyguard_dismiss_intent to flexi flags

Flag: ACONFIG com.android.systemui.device_entry_udfps_refactor TRUNKFOOD
Flag: ACONFIG com.android.systemui.refactor_keyguard_dismiss_intent DEVELOPMENT
Flag: ACONFIG com.android.systemui.scene_container DEVELOPMENT
Test: atest SharedNotificationContainerViewModelTest
Test: Builds
Bug: 308819693
Change-Id: I9c9627ac7b3c1d566fc343b2b26402a34c4dbd0f
parent 8e9278d6
Loading
Loading
Loading
Loading
+2 −1
Original line number Original line Diff line number Diff line
@@ -94,7 +94,6 @@ class SharedNotificationContainerViewModelTest : SysuiTestCase() {


    @Before
    @Before
    fun setUp() {
    fun setUp() {
        mSetFlagsRule.disableFlags(com.android.systemui.Flags.FLAG_REFACTOR_KEYGUARD_DISMISS_INTENT)
        overrideResource(R.bool.config_use_split_notification_shade, false)
        overrideResource(R.bool.config_use_split_notification_shade, false)
        movementFlow = MutableStateFlow(BurnInModel())
        movementFlow = MutableStateFlow(BurnInModel())
        whenever(aodBurnInViewModel.movement(any())).thenReturn(movementFlow)
        whenever(aodBurnInViewModel.movement(any())).thenReturn(movementFlow)
@@ -691,6 +690,7 @@ class SharedNotificationContainerViewModelTest : SysuiTestCase() {
        }
        }


    @Test
    @Test
    @DisableFlags(FLAG_SCENE_CONTAINER)
    fun translationYUpdatesOnKeyguardForBurnIn() =
    fun translationYUpdatesOnKeyguardForBurnIn() =
        testScope.runTest {
        testScope.runTest {
            val translationY by collectLastValue(underTest.translationY(BurnInParameters()))
            val translationY by collectLastValue(underTest.translationY(BurnInParameters()))
@@ -724,6 +724,7 @@ class SharedNotificationContainerViewModelTest : SysuiTestCase() {
        }
        }


    @Test
    @Test
    @DisableFlags(FLAG_SCENE_CONTAINER)
    fun translationYDoesNotUpdateWhenShadeIsExpanded() =
    fun translationYDoesNotUpdateWhenShadeIsExpanded() =
        testScope.runTest {
        testScope.runTest {
            val translationY by collectLastValue(underTest.translationY(BurnInParameters()))
            val translationY by collectLastValue(underTest.translationY(BurnInParameters()))
+7 −1
Original line number Original line Diff line number Diff line
@@ -21,12 +21,14 @@ package com.android.systemui.scene.shared.flag
import com.android.systemui.Flags.FLAG_SCENE_CONTAINER
import com.android.systemui.Flags.FLAG_SCENE_CONTAINER
import com.android.systemui.Flags.sceneContainer
import com.android.systemui.Flags.sceneContainer
import com.android.systemui.dagger.SysUISingleton
import com.android.systemui.dagger.SysUISingleton
import com.android.systemui.deviceentry.shared.DeviceEntryUdfpsRefactor
import com.android.systemui.flags.FlagToken
import com.android.systemui.flags.FlagToken
import com.android.systemui.flags.RefactorFlagUtils
import com.android.systemui.flags.RefactorFlagUtils
import com.android.systemui.keyguard.KeyguardBottomAreaRefactor
import com.android.systemui.keyguard.KeyguardBottomAreaRefactor
import com.android.systemui.keyguard.KeyguardWmStateRefactor
import com.android.systemui.keyguard.KeyguardWmStateRefactor
import com.android.systemui.keyguard.MigrateClocksToBlueprint
import com.android.systemui.keyguard.MigrateClocksToBlueprint
import com.android.systemui.keyguard.shared.ComposeLockscreen
import com.android.systemui.keyguard.shared.ComposeLockscreen
import com.android.systemui.keyguard.shared.RefactorKeyguardDismissIntent
import com.android.systemui.media.controls.util.MediaInSceneContainerFlag
import com.android.systemui.media.controls.util.MediaInSceneContainerFlag
import com.android.systemui.statusbar.notification.shared.NotificationsHeadsUpRefactor
import com.android.systemui.statusbar.notification.shared.NotificationsHeadsUpRefactor
import com.android.systemui.statusbar.phone.PredictiveBackSysUiFlag
import com.android.systemui.statusbar.phone.PredictiveBackSysUiFlag
@@ -48,7 +50,9 @@ object SceneContainerFlag {
                MediaInSceneContainerFlag.isEnabled &&
                MediaInSceneContainerFlag.isEnabled &&
                MigrateClocksToBlueprint.isEnabled &&
                MigrateClocksToBlueprint.isEnabled &&
                NotificationsHeadsUpRefactor.isEnabled &&
                NotificationsHeadsUpRefactor.isEnabled &&
                PredictiveBackSysUiFlag.isEnabled
                PredictiveBackSysUiFlag.isEnabled &&
                DeviceEntryUdfpsRefactor.isEnabled &&
                RefactorKeyguardDismissIntent.isEnabled
    // NOTE: Changes should also be made in getSecondaryFlags and @EnableSceneContainer
    // NOTE: Changes should also be made in getSecondaryFlags and @EnableSceneContainer


    /** The main aconfig flag. */
    /** The main aconfig flag. */
@@ -64,6 +68,8 @@ object SceneContainerFlag {
            MigrateClocksToBlueprint.token,
            MigrateClocksToBlueprint.token,
            NotificationsHeadsUpRefactor.token,
            NotificationsHeadsUpRefactor.token,
            PredictiveBackSysUiFlag.token,
            PredictiveBackSysUiFlag.token,
            DeviceEntryUdfpsRefactor.token,
            RefactorKeyguardDismissIntent.token,
            // NOTE: Changes should also be made in isEnabled and @EnableSceneContainer
            // NOTE: Changes should also be made in isEnabled and @EnableSceneContainer
        )
        )


+4 −0
Original line number Original line Diff line number Diff line
@@ -18,12 +18,14 @@ package com.android.systemui.flags


import android.platform.test.annotations.EnableFlags
import android.platform.test.annotations.EnableFlags
import com.android.systemui.Flags.FLAG_COMPOSE_LOCKSCREEN
import com.android.systemui.Flags.FLAG_COMPOSE_LOCKSCREEN
import com.android.systemui.Flags.FLAG_DEVICE_ENTRY_UDFPS_REFACTOR
import com.android.systemui.Flags.FLAG_KEYGUARD_BOTTOM_AREA_REFACTOR
import com.android.systemui.Flags.FLAG_KEYGUARD_BOTTOM_AREA_REFACTOR
import com.android.systemui.Flags.FLAG_KEYGUARD_WM_STATE_REFACTOR
import com.android.systemui.Flags.FLAG_KEYGUARD_WM_STATE_REFACTOR
import com.android.systemui.Flags.FLAG_MEDIA_IN_SCENE_CONTAINER
import com.android.systemui.Flags.FLAG_MEDIA_IN_SCENE_CONTAINER
import com.android.systemui.Flags.FLAG_MIGRATE_CLOCKS_TO_BLUEPRINT
import com.android.systemui.Flags.FLAG_MIGRATE_CLOCKS_TO_BLUEPRINT
import com.android.systemui.Flags.FLAG_NOTIFICATIONS_HEADS_UP_REFACTOR
import com.android.systemui.Flags.FLAG_NOTIFICATIONS_HEADS_UP_REFACTOR
import com.android.systemui.Flags.FLAG_PREDICTIVE_BACK_SYSUI
import com.android.systemui.Flags.FLAG_PREDICTIVE_BACK_SYSUI
import com.android.systemui.Flags.FLAG_REFACTOR_KEYGUARD_DISMISS_INTENT
import com.android.systemui.Flags.FLAG_SCENE_CONTAINER
import com.android.systemui.Flags.FLAG_SCENE_CONTAINER


/**
/**
@@ -39,6 +41,8 @@ import com.android.systemui.Flags.FLAG_SCENE_CONTAINER
    FLAG_NOTIFICATIONS_HEADS_UP_REFACTOR,
    FLAG_NOTIFICATIONS_HEADS_UP_REFACTOR,
    FLAG_PREDICTIVE_BACK_SYSUI,
    FLAG_PREDICTIVE_BACK_SYSUI,
    FLAG_SCENE_CONTAINER,
    FLAG_SCENE_CONTAINER,
    FLAG_DEVICE_ENTRY_UDFPS_REFACTOR,
    FLAG_REFACTOR_KEYGUARD_DISMISS_INTENT,
)
)
@Retention(AnnotationRetention.RUNTIME)
@Retention(AnnotationRetention.RUNTIME)
@Target(AnnotationTarget.FUNCTION, AnnotationTarget.CLASS)
@Target(AnnotationTarget.FUNCTION, AnnotationTarget.CLASS)
+33 −0
Original line number Original line Diff line number Diff line
/*
 * Copyright (C) 2024 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package com.android.systemui.keyguard.domain.interactor

import com.android.systemui.keyguard.data.repository.keyguardRepository
import com.android.systemui.kosmos.Kosmos
import com.android.systemui.kosmos.testScope
import kotlinx.coroutines.ExperimentalCoroutinesApi

@ExperimentalCoroutinesApi
val Kosmos.keyguardDismissActionInteractor by
    Kosmos.Fixture {
        KeyguardDismissActionInteractor(
            repository = keyguardRepository,
            transitionInteractor = keyguardTransitionInteractor,
            dismissInteractor = keyguardDismissInteractor,
            applicationScope = testScope.backgroundScope,
        )
    }
+39 −0
Original line number Original line Diff line number Diff line
/*
 * Copyright (C) 2024 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package com.android.systemui.keyguard.domain.interactor

import com.android.systemui.bouncer.domain.interactor.alternateBouncerInteractor
import com.android.systemui.bouncer.domain.interactor.primaryBouncerInteractor
import com.android.systemui.keyguard.data.repository.keyguardRepository
import com.android.systemui.keyguard.data.repository.trustRepository
import com.android.systemui.kosmos.Kosmos
import com.android.systemui.power.domain.interactor.powerInteractor
import com.android.systemui.user.domain.interactor.selectedUserInteractor
import kotlinx.coroutines.ExperimentalCoroutinesApi

@ExperimentalCoroutinesApi
val Kosmos.keyguardDismissInteractor by
    Kosmos.Fixture {
        KeyguardDismissInteractor(
            trustRepository = trustRepository,
            keyguardRepository = keyguardRepository,
            primaryBouncerInteractor = primaryBouncerInteractor,
            alternateBouncerInteractor = alternateBouncerInteractor,
            powerInteractor = powerInteractor,
            selectedUserInteractor = selectedUserInteractor,
        )
    }
Loading