diff options
| author | 2023-09-29 15:46:58 +0000 | |
|---|---|---|
| committer | 2023-09-29 15:46:58 +0000 | |
| commit | 54cf6ff55077b25242cea89c043d00a69f59ec07 (patch) | |
| tree | 3b5d4ce94fdcf104aa54b83a3266f1be7a94c2b1 | |
| parent | cfcad9c25eec1025185c4a966b926c1c1c29df4b (diff) | |
| parent | 116c333741940c9511eebc92f9681cba0f823056 (diff) | |
Merge "Revert "Revert "Updated AnimatedContentScope to AnimatedContentT..."" into aosp-main-future
| -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 -> |