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

Commit 411a4c14 authored by Jordan Demeulenaere's avatar Jordan Demeulenaere
Browse files

Move TransitionState into its own file (1/2) 

This CL is a pure move of the TransitionState class into its own file.
In a follow-up CL, this class will be split into a ContentState class
that will be shared with overlay states.

Bug: 353679003
Test: atest PlatformComposeSceneTransitionLayoutTests
Flag: com.android.systemui.scene_container

Change-Id: Iab5c90f03967fba744bf91e08a662c5ffa7a4ec1
parent df559727

packages/SystemUI/compose/features/src/com/android/systemui/media/controls/ui/composable/MediaScenePicker.kt

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import com.android.compose.animation.scene.ElementKey 
import com.android.compose.animation.scene.ElementScenePicker

import com.android.compose.animation.scene.SceneKey

import com.android.compose.animation.scene.SceneTransitionLayoutState

import com.android.compose.animation.scene.TransitionState

import com.android.compose.animation.scene.content.state.TransitionState

import com.android.systemui.scene.shared.model.Scenes



/** [ElementScenePicker] implementation for the media carousel object. */

packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettings.kt

+1 −1
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle 
import com.android.compose.animation.scene.ElementKey

import com.android.compose.animation.scene.MovableElementScenePicker

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

import com.android.compose.animation.scene.TransitionState

import com.android.compose.animation.scene.ValueKey

import com.android.compose.animation.scene.content.state.TransitionState

import com.android.compose.modifiers.thenIf

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

import com.android.systemui.qs.ui.adapter.QSSceneAdapter

packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt

+1 −1
Original line number Diff line number Diff line
@@ -68,11 +68,11 @@ import androidx.compose.ui.unit.IntOffset 
import androidx.compose.ui.unit.dp

import androidx.lifecycle.compose.collectAsStateWithLifecycle

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

import com.android.compose.animation.scene.TransitionState

import com.android.compose.animation.scene.UserAction

import com.android.compose.animation.scene.UserActionResult

import com.android.compose.animation.scene.animateSceneDpAsState

import com.android.compose.animation.scene.animateSceneFloatAsState

import com.android.compose.animation.scene.content.state.TransitionState

import com.android.compose.modifiers.thenIf

import com.android.compose.windowsizeclass.LocalWindowSizeClass

import com.android.systemui.battery.BatteryMeterViewController

packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeHeader.kt

+13 −11
Original line number Diff line number Diff line
@@ -61,9 +61,9 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle 
import com.android.compose.animation.scene.ElementKey

import com.android.compose.animation.scene.LowestZIndexScenePicker

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

import com.android.compose.animation.scene.TransitionState

import com.android.compose.animation.scene.ValueKey

import com.android.compose.animation.scene.animateElementFloatAsState

import com.android.compose.animation.scene.content.state.TransitionState

import com.android.compose.modifiers.thenIf

import com.android.compose.windowsizeclass.LocalWindowSizeClass

import com.android.settingslib.Utils
@@ -110,6 +110,7 @@ object ShadeHeader { 
    object Colors {

        val ColorScheme.shadeHeaderText: Color

            get() = Color.White



        val ColorScheme.onScrimDim: Color

            get() = Color.DarkGray

    }
@@ -552,12 +553,13 @@ private fun SystemIconContainer( 
    val interactionSource = remember { MutableInteractionSource() }

    val isHovered by interactionSource.collectIsHoveredAsState()



    val hoverModifier = Modifier

            .clip(RoundedCornerShape(CollapsedHeight / 4))

    val hoverModifier =

        Modifier.clip(RoundedCornerShape(CollapsedHeight / 4))

            .background(MaterialTheme.colorScheme.onScrimDim)



    Row(

        modifier = modifier

        modifier =

            modifier

                .height(CollapsedHeight)

                .padding(vertical = CollapsedHeight / 4)

                .thenIf(isClickable) {

packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeScene.kt

+1 −1
Original line number Diff line number Diff line
@@ -66,11 +66,11 @@ import com.android.compose.animation.scene.ElementKey 
import com.android.compose.animation.scene.LowestZIndexScenePicker

import com.android.compose.animation.scene.NestedScrollBehavior

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

import com.android.compose.animation.scene.TransitionState

import com.android.compose.animation.scene.UserAction

import com.android.compose.animation.scene.UserActionResult

import com.android.compose.animation.scene.animateSceneDpAsState

import com.android.compose.animation.scene.animateSceneFloatAsState

import com.android.compose.animation.scene.content.state.TransitionState

import com.android.compose.modifiers.padding

import com.android.compose.modifiers.thenIf

import com.android.compose.windowsizeclass.LocalWindowSizeClass