diff options
| -rw-r--r-- | packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/BrowseActivity.kt | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/BrowseActivity.kt b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/BrowseActivity.kt index 0f5862a9829d..afce16c530c7 100644 --- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/BrowseActivity.kt +++ b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/BrowseActivity.kt @@ -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 -> |