Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ad4e648 authored by Anvesh Renikindi's avatar Anvesh Renikindi Committed by Automerger Merge Worker
Browse files

Merge "Revert "Revert "Updated AnimatedContentScope to AnimatedContentT...""... 

Merge "Revert "Revert "Updated AnimatedContentScope to AnimatedContentT..."" into udc-qpr-dev am: 6dd365cf

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



Change-Id: I51c734a0bd46efec8923b06c558468acc8559287
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 36a4d892 6dd365cf

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

+9 −5
Original line number Diff line number Diff line
@@ -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 ->