Merge "Revert "Revert "Updated AnimatedContentScope to AnimatedContentT..."" into aosp-main-future (54cf6ff5) · Commits · e / os / android_frameworks_base

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

+9 −5

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.AnimatedContentScope
		import androidx.compose.animation.AnimatedContentTransitionScope
		import androidx.compose.animation.ExperimentalAnimationApi
		import androidx.compose.animation.core.tween
		import androidx.compose.animation.fadeIn
		@@ -146,22 +146,26 @@ private fun NavControllerWrapperImpl.NavContent(
		arguments = spp.parameter,
		enterTransition = {
		slideIntoContainer(
		AnimatedContentScope.SlideDirection.Start, animationSpec = slideEffect
		AnimatedContentTransitionScope.SlideDirection.Start,
		animationSpec = slideEffect
		) + fadeIn(animationSpec = fadeEffect)
		},
		exitTransition = {
		slideOutOfContainer(
		AnimatedContentScope.SlideDirection.Start, animationSpec = slideEffect
		AnimatedContentTransitionScope.SlideDirection.Start,
		animationSpec = slideEffect
		) + fadeOut(animationSpec = fadeEffect)
		},
		popEnterTransition = {
		slideIntoContainer(
		AnimatedContentScope.SlideDirection.End, animationSpec = slideEffect
		AnimatedContentTransitionScope.SlideDirection.End,
		animationSpec = slideEffect
		) + fadeIn(animationSpec = fadeEffect)
		},
		popExitTransition = {
		slideOutOfContainer(
		AnimatedContentScope.SlideDirection.End, animationSpec = slideEffect
		AnimatedContentTransitionScope.SlideDirection.End,
		animationSpec = slideEffect
		) + fadeOut(animationSpec = fadeEffect)
		},
		) { navBackStackEntry ->