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

Commit 4a26f673 authored by Bryce Lee's avatar Bryce Lee Committed by Android (Google) Code Review
Browse files

Merge "Enable swipe to dismiss gesture on glanceable hub." into main

parents 0de6b68f 901697cd

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

+1 −6
Original line number Original line Diff line number Diff line
@@ -207,12 +207,7 @@ fun CommunalContainer( 
            Box(modifier = Modifier.fillMaxSize())

            Box(modifier = Modifier.fillMaxSize())

        }

        }





        scene(

        scene(CommunalScenes.Communal, userActions = mapOf(Swipe.End to CommunalScenes.Blank)) {

            CommunalScenes.Communal,

            userActions =

                if (viewModel.v2FlagEnabled()) emptyMap()

                else mapOf(Swipe.End to CommunalScenes.Blank),

        ) {

            CommunalScene(

            CommunalScene(

                backgroundType = backgroundType,

                backgroundType = backgroundType,

                colors = colors,

                colors = colors,

packages/SystemUI/src/com/android/systemui/keyguard/ui/KeyguardTransitionAnimationFlow.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -69,7 +69,7 @@ constructor( 
         * Note that [onCancel] isn't used when the scene framework is enabled.

         * Note that [onCancel] isn't used when the scene framework is enabled.

         */

         */

        fun sharedFlow(

        fun sharedFlow(

            duration: Duration,

            duration: Duration = transitionDuration,

            onStep: (Float) -> Float,

            onStep: (Float) -> Float,

            startTime: Duration = 0.milliseconds,

            startTime: Duration = 0.milliseconds,

            onStart: (() -> Unit)? = null,

            onStart: (() -> Unit)? = null,

packages/SystemUI/src/com/android/systemui/keyguard/ui/transitions/GlanceableHubBlurProvider.kt

+13 −2
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 




package com.android.systemui.keyguard.ui.transitions

package com.android.systemui.keyguard.ui.transitions





import android.util.MathUtils

import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow

import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow

import javax.inject.Inject

import javax.inject.Inject

import kotlinx.coroutines.flow.Flow

import kotlinx.coroutines.flow.Flow
@@ -33,8 +34,18 @@ constructor( 
    blurConfig: BlurConfig,

    blurConfig: BlurConfig,

) {

) {

    val exitBlurRadius: Flow<Float> =

    val exitBlurRadius: Flow<Float> =

        transitionAnimation.immediatelyTransitionTo(blurConfig.minBlurRadiusPx)

        transitionAnimation.sharedFlow(

            onStep = { MathUtils.lerp(blurConfig.maxBlurRadiusPx, blurConfig.minBlurRadiusPx, it) },

            onStart = { blurConfig.maxBlurRadiusPx },

            onFinish = { blurConfig.minBlurRadiusPx },

            onCancel = { blurConfig.maxBlurRadiusPx },

        )





    val enterBlurRadius: Flow<Float> =

    val enterBlurRadius: Flow<Float> =

        transitionAnimation.immediatelyTransitionTo(blurConfig.maxBlurRadiusPx)

        transitionAnimation.sharedFlow(

            onStep = { MathUtils.lerp(blurConfig.minBlurRadiusPx, blurConfig.maxBlurRadiusPx, it) },

            onStart = { blurConfig.minBlurRadiusPx },

            onFinish = { blurConfig.maxBlurRadiusPx },

            onCancel = { blurConfig.minBlurRadiusPx },

        )

}
 
}