From c1f15887632528b588f569c1b3977a2b3b6159e1 Mon Sep 17 00:00:00 2001
From: Anvesh Renikindi <renikindi@google.com>
Date: Thu, 11 May 2023 17:20:42 +0000
Subject: [PATCH] Revert "Revert "Updated AnimatedContentScope to
AnimatedContentT..."
Revert submission 23149513-revert-22208109-lifecycle_9778738-CXBRVAFFSZ
Reason for revert: <b/281883862 is fixed >
Reverted changes: /q/submissionid:23149513-revert-22208109-lifecycle_9778738-CXBRVAFFSZ
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b9e55e9415f7bf1b2f170b8dff72c7173018ba2f)
Merged-In: Ic6050d6ae6e720841ce2129880f1f7ed43328185
Change-Id: Ic6050d6ae6e720841ce2129880f1f7ed43328185
---
.../settingslib/spa/framework/BrowseActivity.kt | 14 +++++++++-----
1 file 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 ->
--
GitLab