From 4b014fbac2ac7f7d8b131d46af9bcdb52b2ad8da Mon Sep 17 00:00:00 2001 From: Yi-Ling Chuang Date: Fri, 23 Apr 2021 18:47:04 +0800 Subject: [PATCH] Add fade through threshould to the transition Fixes: 177480673 Test: rebuild Change-Id: I5dde8d990e437717bc0a52fa522ea13105af6cde --- .../settingslib/transition/SettingsTransitionHelper.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/SettingsLib/SettingsTransition/src/com/android/settingslib/transition/SettingsTransitionHelper.java b/packages/SettingsLib/SettingsTransition/src/com/android/settingslib/transition/SettingsTransitionHelper.java index 6560a181d3528..ed447f8736101 100644 --- a/packages/SettingsLib/SettingsTransition/src/com/android/settingslib/transition/SettingsTransitionHelper.java +++ b/packages/SettingsLib/SettingsTransition/src/com/android/settingslib/transition/SettingsTransitionHelper.java @@ -25,6 +25,7 @@ import android.view.animation.Interpolator; import androidx.core.os.BuildCompat; +import com.google.android.material.transition.platform.FadeThroughProvider; import com.google.android.material.transition.platform.MaterialSharedAxis; import com.google.android.material.transition.platform.SlideDistanceProvider; @@ -35,6 +36,7 @@ public class SettingsTransitionHelper { private static final String TAG = "SettingsTransitionHelper"; private static final long DURATION = 450L; + private static final float FADE_THROUGH_THRESHOLD = 0.22F; private static MaterialSharedAxis createSettingsSharedAxis(Context context, boolean forward) { final MaterialSharedAxis transition = new MaterialSharedAxis(MaterialSharedAxis.X, forward); @@ -48,12 +50,14 @@ public class SettingsTransitionHelper { forwardDistanceProvider.setSlideDistance(distance); transition.setDuration(DURATION); + final FadeThroughProvider fadeThroughProvider = + (FadeThroughProvider) transition.getSecondaryAnimatorProvider(); + fadeThroughProvider.setProgressThreshold(FADE_THROUGH_THRESHOLD); + final Interpolator interpolator = AnimationUtils.loadInterpolator(context, R.interpolator.fast_out_extra_slow_in); transition.setInterpolator(interpolator); - // TODO(b/177480673): Update fade through threshold once (cl/362065364) is released - return transition; }