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

Commit 1c3fae09 authored by Lucas Dupin's avatar Lucas Dupin Committed by Automerger Merge Worker
Browse files

Merge "Revert "Added interpolated blur animation for status bar"" into rvc-dev...

Merge "Revert "Added interpolated blur animation for status bar"" into rvc-dev am: efc98fc7 am: e1e27c07 am: 05aefadd

Change-Id: If754d8633b2f3cc4c92db9174dc2ab3363cb1865
parents 2e80e998 05aefadd
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -49,8 +49,6 @@ public class Interpolators {
    public static final Interpolator CUSTOM_40_40 = new PathInterpolator(0.4f, 0f, 0.6f, 1f);
    public static final Interpolator HEADS_UP_APPEAR = new HeadsUpAppearInterpolator();
    public static final Interpolator ICON_OVERSHOT = new PathInterpolator(0.4f, 0f, 0.2f, 1.4f);
    public static final Interpolator SHADE_ANIMATION =
            new PathInterpolator(0.6f, 0.02f, 0.4f, 0.98f);
    public static final Interpolator ICON_OVERSHOT_LESS
            = new PathInterpolator(0.4f, 0f, 0.2f, 1.1f);
    public static final Interpolator PANEL_CLOSE_ACCELERATED
+1 −5
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.animation.AnimatorListenerAdapter
import android.animation.ValueAnimator
import android.app.WallpaperManager
import android.util.Log
import android.util.MathUtils
import android.view.Choreographer
import android.view.View
import androidx.annotation.VisibleForTesting
@@ -252,10 +251,7 @@ class NotificationShadeDepthController @Inject constructor(
        var newBlur = 0
        val state = statusBarStateController.state
        if (state == StatusBarState.SHADE || state == StatusBarState.SHADE_LOCKED) {
            val animatedBlur =
                    Interpolators.SHADE_ANIMATION.getInterpolation(
                            MathUtils.constrain(shadeExpansion / 0.15f, 0f, 1f))
            newBlur = blurUtils.blurRadiusOfRatio(0.35f * animatedBlur + 0.65f * shadeExpansion)
            newBlur = blurUtils.blurRadiusOfRatio(shadeExpansion)
        }
        shadeSpring.animateTo(newBlur)
    }