Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Revert "Updated AnimatedContentScope to AnimatedContentT..."" into udc-dev-plus-aosp am: 631fe7a403

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23816586

Change-Id: I9a04c6e6f0c4922e978edba4e984685a153407eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Anvesh Renikindi
2023-06-27 15:53:04 +00:00
committed by Automerger Merge Worker
parent 475c18ff80 631fe7a403
commit 5e95b07c2e
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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