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

Commit 348e4716 authored by Brandon Liu's avatar Brandon Liu
Browse files

Revert "Updated AnimatedContentScope to AnimatedContentTransitio..." 

Revert submission 22208109-lifecycle_9778738

Reason for revert: <ACA identified this is the culprit of build failure b/281883862>

Reverted changes: /q/submissionid:22208109-lifecycle_9778738

Change-Id: I401e066557d1497b03cbcc5d285c2a564cd2d4cd
parent 1b3d8945

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

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

import androidx.activity.compose.setContent

import androidx.annotation.VisibleForTesting

import androidx.compose.animation.AnimatedContentTransitionScope

import androidx.compose.animation.AnimatedContentScope

import androidx.compose.animation.ExperimentalAnimationApi

import androidx.compose.animation.core.tween

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

                enterTransition = {

                    slideIntoContainer(

                        AnimatedContentTransitionScope.SlideDirection.Start,

                        animationSpec = slideEffect

                        AnimatedContentScope.SlideDirection.Start, animationSpec = slideEffect

                    ) + fadeIn(animationSpec = fadeEffect)

                },

                exitTransition = {

                    slideOutOfContainer(

                        AnimatedContentTransitionScope.SlideDirection.Start,

                        animationSpec = slideEffect

                        AnimatedContentScope.SlideDirection.Start, animationSpec = slideEffect

                    ) + fadeOut(animationSpec = fadeEffect)

                },

                popEnterTransition = {

                    slideIntoContainer(

                        AnimatedContentTransitionScope.SlideDirection.End,

                        animationSpec = slideEffect

                        AnimatedContentScope.SlideDirection.End, animationSpec = slideEffect

                    ) + fadeIn(animationSpec = fadeEffect)

                },

                popExitTransition = {

                    slideOutOfContainer(

                        AnimatedContentTransitionScope.SlideDirection.End,

                        animationSpec = slideEffect

                        AnimatedContentScope.SlideDirection.End, animationSpec = slideEffect

                    ) + fadeOut(animationSpec = fadeEffect)

                },

            ) { navBackStackEntry ->