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

Commit c1f15887 authored by Anvesh Renikindi's avatar Anvesh Renikindi Committed by Cherrypicker Worker
Browse files

Revert "Revert "Updated AnimatedContentScope to AnimatedContentT..." 

Revert submission 23149513-revert-22208109-lifecycle_9778738-CXBRVAFFSZ

Reason for revert: <b/281883862 is fixed >

Reverted changes: /q/submissionid:23149513-revert-22208109-lifecycle_9778738-CXBRVAFFSZ
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b9e55e9415f7bf1b2f170b8dff72c7173018ba2f)
Merged-In: Ic6050d6ae6e720841ce2129880f1f7ed43328185
Change-Id: Ic6050d6ae6e720841ce2129880f1f7ed43328185
parent 7e15d051

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/BrowseActivity.kt

+9 −5
Original line number Original line Diff line number Diff line
@@ -24,7 +24,7 @@ import android.util.Log 
import androidx.activity.ComponentActivity

import androidx.activity.ComponentActivity

import androidx.activity.compose.setContent

import androidx.activity.compose.setContent

import androidx.annotation.VisibleForTesting

import androidx.annotation.VisibleForTesting

import androidx.compose.animation.AnimatedContentScope

import androidx.compose.animation.AnimatedContentTransitionScope

import androidx.compose.animation.ExperimentalAnimationApi

import androidx.compose.animation.ExperimentalAnimationApi

import androidx.compose.animation.core.tween

import androidx.compose.animation.core.tween

import androidx.compose.animation.fadeIn

import androidx.compose.animation.fadeIn
@@ -146,22 +146,26 @@ private fun NavControllerWrapperImpl.NavContent( 
                arguments = spp.parameter,

                arguments = spp.parameter,

                enterTransition = {

                enterTransition = {

                    slideIntoContainer(

                    slideIntoContainer(

                        AnimatedContentScope.SlideDirection.Start, animationSpec = slideEffect

                        AnimatedContentTransitionScope.SlideDirection.Start,

                        animationSpec = slideEffect

                    ) + fadeIn(animationSpec = fadeEffect)

                    ) + fadeIn(animationSpec = fadeEffect)

                },

                },

                exitTransition = {

                exitTransition = {

                    slideOutOfContainer(

                    slideOutOfContainer(

                        AnimatedContentScope.SlideDirection.Start, animationSpec = slideEffect

                        AnimatedContentTransitionScope.SlideDirection.Start,

                        animationSpec = slideEffect

                    ) + fadeOut(animationSpec = fadeEffect)

                    ) + fadeOut(animationSpec = fadeEffect)

                },

                },

                popEnterTransition = {

                popEnterTransition = {

                    slideIntoContainer(

                    slideIntoContainer(

                        AnimatedContentScope.SlideDirection.End, animationSpec = slideEffect

                        AnimatedContentTransitionScope.SlideDirection.End,

                        animationSpec = slideEffect

                    ) + fadeIn(animationSpec = fadeEffect)

                    ) + fadeIn(animationSpec = fadeEffect)

                },

                },

                popExitTransition = {

                popExitTransition = {

                    slideOutOfContainer(

                    slideOutOfContainer(

                        AnimatedContentScope.SlideDirection.End, animationSpec = slideEffect

                        AnimatedContentTransitionScope.SlideDirection.End,

                        animationSpec = slideEffect

                    ) + fadeOut(animationSpec = fadeEffect)

                    ) + fadeOut(animationSpec = fadeEffect)

                },

                },

            ) { navBackStackEntry ->

            ) { navBackStackEntry ->