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

Commit 65c97bcb authored by Jordan Demeulenaere's avatar Jordan Demeulenaere
Browse files

Remove the fork of STL UserAction 

Bug: 293899074
Test: m sysuig
Test: m SystemUITests
Test: Manual, enabled Flexiglass and used it.
Flag: N/A
Change-Id: If8c6f2187f91630ee61a35e5679795be11333b46
parent b1ee802f

packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/BouncerScene.kt

+6 −4
Original line number Diff line number Diff line
@@ -22,15 +22,17 @@ import androidx.compose.foundation.layout.fillMaxSize 
import androidx.compose.material3.MaterialTheme

import androidx.compose.runtime.Composable

import androidx.compose.ui.Modifier

import com.android.compose.animation.scene.Back

import com.android.compose.animation.scene.ElementKey

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

import com.android.compose.animation.scene.Swipe

import com.android.compose.animation.scene.SwipeDirection

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

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

import com.android.systemui.bouncer.ui.BouncerDialogFactory

import com.android.systemui.bouncer.ui.viewmodel.BouncerViewModel

import com.android.systemui.dagger.SysUISingleton

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

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

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

import com.android.systemui.scene.ui.composable.ComposableScene

import javax.inject.Inject

import kotlinx.coroutines.flow.MutableStateFlow
@@ -57,8 +59,8 @@ constructor( 
    override val destinationScenes: StateFlow<Map<UserAction, UserActionResult>> =

        MutableStateFlow(

                mapOf(

                    UserAction.Back to UserActionResult(Scenes.Lockscreen),

                    UserAction.Swipe(Direction.DOWN) to UserActionResult(Scenes.Lockscreen),

                    Back to UserActionResult(Scenes.Lockscreen),

                    Swipe(SwipeDirection.Down) to UserActionResult(Scenes.Lockscreen),

                )

            )

            .asStateFlow()

packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalScene.kt

+4 −3
Original line number Diff line number Diff line
@@ -19,12 +19,13 @@ package com.android.systemui.communal.ui.compose 
import androidx.compose.runtime.Composable

import androidx.compose.ui.Modifier

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

import com.android.compose.animation.scene.Swipe

import com.android.compose.animation.scene.SwipeDirection

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

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

import com.android.systemui.communal.ui.viewmodel.CommunalViewModel

import com.android.systemui.dagger.SysUISingleton

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

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

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

import com.android.systemui.scene.ui.composable.ComposableScene

import javax.inject.Inject

import kotlinx.coroutines.flow.MutableStateFlow
@@ -43,7 +44,7 @@ constructor( 
    override val destinationScenes: StateFlow<Map<UserAction, UserActionResult>> =

        MutableStateFlow<Map<UserAction, UserActionResult>>(

                mapOf(

                    UserAction.Swipe(Direction.RIGHT) to UserActionResult(Scenes.Lockscreen),

                    Swipe(SwipeDirection.Right) to UserActionResult(Scenes.Lockscreen),

                )

            )

            .asStateFlow()

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

+8 −7
Original line number Diff line number Diff line
@@ -19,18 +19,19 @@ package com.android.systemui.keyguard.ui.composable 
import androidx.compose.foundation.layout.fillMaxSize

import androidx.compose.runtime.Composable

import androidx.compose.ui.Modifier

import com.android.compose.animation.scene.Edge

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

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

import com.android.compose.animation.scene.Swipe

import com.android.compose.animation.scene.SwipeDirection

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

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

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

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.keyguard.ui.viewmodel.LockscreenSceneViewModel

import com.android.systemui.qs.ui.composable.QuickSettings

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

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

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

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

import com.android.systemui.scene.ui.composable.ComposableScene

import dagger.Lazy

import javax.inject.Inject
@@ -80,11 +81,11 @@ constructor( 
        left: SceneKey?,

    ): Map<UserAction, UserActionResult> {

        return buildMap {

            up?.let { this[UserAction.Swipe(Direction.UP)] = UserActionResult(up) }

            left?.let { this[UserAction.Swipe(Direction.LEFT)] = UserActionResult(left) }

            this[UserAction.Swipe(fromEdge = Edge.TOP, direction = Direction.DOWN)] =

            up?.let { this[Swipe(SwipeDirection.Up)] = UserActionResult(up) }

            left?.let { this[Swipe(SwipeDirection.Left)] = UserActionResult(left) }

            this[Swipe(fromSource = Edge.Top, direction = SwipeDirection.Down)] =

                UserActionResult(Scenes.QuickSettings)

            this[UserAction.Swipe(direction = Direction.DOWN)] = UserActionResult(Scenes.Shade)

            this[Swipe(direction = SwipeDirection.Down)] = UserActionResult(Scenes.Shade)

        }

    }

}

packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/ComposeAwareExtensions.kt

deleted100644 → 0
+0 −53
Original line number 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.scene.ui.composable



import com.android.compose.animation.scene.Back

import com.android.compose.animation.scene.Edge as ComposeAwareEdge

import com.android.compose.animation.scene.Swipe

import com.android.compose.animation.scene.SwipeDirection

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

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

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

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



// TODO(b/293899074): remove this file once we can use the types from SceneTransitionLayout.



fun UserAction.asComposeAware(): ComposeAwareUserAction {

    return when (this) {

        is UserAction.Swipe ->

            Swipe(

                pointerCount = pointerCount,

                fromSource =

                    when (this.fromEdge) {

                        null -> null

                        Edge.LEFT -> ComposeAwareEdge.Left

                        Edge.TOP -> ComposeAwareEdge.Top

                        Edge.RIGHT -> ComposeAwareEdge.Right

                        Edge.BOTTOM -> ComposeAwareEdge.Bottom

                    },

                direction =

                    when (this.direction) {

                        Direction.LEFT -> SwipeDirection.Left

                        Direction.UP -> SwipeDirection.Up

                        Direction.RIGHT -> SwipeDirection.Right

                        Direction.DOWN -> SwipeDirection.Down

                    }

            )

        is UserAction.Back -> Back

    }

}

packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/GoneScene.kt

+8 −7
Original line number Diff line number Diff line
@@ -20,15 +20,16 @@ import androidx.compose.foundation.layout.Spacer 
import androidx.compose.foundation.layout.fillMaxSize

import androidx.compose.runtime.Composable

import androidx.compose.ui.Modifier

import com.android.compose.animation.scene.Edge

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

import com.android.compose.animation.scene.Swipe

import com.android.compose.animation.scene.SwipeDirection

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

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

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

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.qs.ui.composable.QuickSettings

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

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

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

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

import com.android.systemui.statusbar.notification.stack.ui.viewmodel.NotificationsPlaceholderViewModel

import javax.inject.Inject

import kotlinx.coroutines.flow.MutableStateFlow
@@ -50,12 +51,12 @@ constructor( 
    override val destinationScenes: StateFlow<Map<UserAction, UserActionResult>> =

        MutableStateFlow<Map<UserAction, UserActionResult>>(

                mapOf(

                    UserAction.Swipe(

                    Swipe(

                        pointerCount = 2,

                        fromEdge = Edge.TOP,

                        direction = Direction.DOWN,

                        fromSource = Edge.Top,

                        direction = SwipeDirection.Down,

                    ) to UserActionResult(Scenes.QuickSettings),

                    UserAction.Swipe(direction = Direction.DOWN) to UserActionResult(Scenes.Shade),

                    Swipe(direction = SwipeDirection.Down) to UserActionResult(Scenes.Shade),

                )

            )

            .asStateFlow()