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

Commit 3d76013a authored by Justin Weir's avatar Justin Weir
Browse files

Lockscreen E2E test improvements 

Moves, removes, and adds some IDs better match the expectations of our
E2E test utils and eliminate ID duplication. Updates some utils, too.

Bug: 338267587
Test: yes
Flag: ACONFIG com.android.systemui.scene_container DEVELOPMENT
Change-Id: Ia32daf61ba3653d65d9049d4fc5804229b3de149
parent 3ab803c3

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/LockscreenContent.kt

+2 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import androidx.compose.ui.Modifier 
import androidx.compose.ui.platform.LocalView

import androidx.lifecycle.compose.collectAsStateWithLifecycle

import com.android.compose.animation.scene.SceneScope

import com.android.systemui.compose.modifiers.sysuiResTag

import com.android.systemui.keyguard.domain.interactor.KeyguardClockInteractor

import com.android.systemui.keyguard.ui.composable.blueprint.ComposableLockscreenSceneBlueprint

import com.android.systemui.keyguard.ui.viewmodel.LockscreenContentViewModel
@@ -60,6 +61,6 @@ constructor( 
        }



        val blueprint = blueprintByBlueprintId[blueprintId] ?: return

        with(blueprint) { Content(modifier) }

        with(blueprint) { Content(modifier.sysuiResTag("keyguard_root_view")) }

    }

}

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/blueprint/DefaultBlueprint.kt

+2 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import androidx.compose.ui.unit.IntRect 
import androidx.lifecycle.compose.collectAsStateWithLifecycle

import com.android.compose.animation.scene.SceneScope

import com.android.compose.modifiers.padding

import com.android.systemui.compose.modifiers.sysuiResTag

import com.android.systemui.keyguard.ui.composable.LockscreenLongPress

import com.android.systemui.keyguard.ui.composable.section.AmbientIndicationSection

import com.android.systemui.keyguard.ui.composable.section.BottomAreaSection
@@ -129,7 +130,7 @@ constructor( 
                    with(lockSection) { LockIcon() }



                    // Aligned to bottom and constrained to below the lock icon.

                    Column(modifier = Modifier.fillMaxWidth()) {

                    Column(modifier = Modifier.fillMaxWidth().sysuiResTag("keyguard_bottom_area")) {

                        if (isUdfpsVisible && ambientIndicationSectionOptional.isPresent) {

                            with(ambientIndicationSectionOptional.get()) {

                                AmbientIndication(modifier = Modifier.fillMaxWidth())

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/TopAreaSection.kt

+1 −2
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle 
import com.android.compose.animation.scene.SceneScope

import com.android.compose.animation.scene.SceneTransitionLayout

import com.android.compose.modifiers.thenIf

import com.android.systemui.compose.modifiers.sysuiResTag

import com.android.systemui.keyguard.domain.interactor.KeyguardClockInteractor

import com.android.systemui.keyguard.ui.composable.blueprint.ClockScenes.largeClockScene

import com.android.systemui.keyguard.ui.composable.blueprint.ClockScenes.smallClockScene
@@ -80,7 +79,7 @@ constructor( 
            }



        SceneTransitionLayout(

            modifier = modifier.sysuiResTag("keyguard_clock_container"),

            modifier = modifier,

            currentScene = currentScene,

            onChangeScene = {},

            transitions = ClockTransition.defaultClockTransitions,