Merge "Revert "Revert "Updated AnimatedContentScope to AnimatedContentT..."" into udc-qpr-dev (6dd365cf) · Commits · e / os / android_frameworks_base

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 ->