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

Commit 029cc6ae authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Revert "Added interpolated blur animation for status bar" 

This reverts commit 2e98f50e.

Reason for revert: This is making the blur value change drastically when pulling up the shade. It helps when pulling down slowly, but unfortunately affects the fling gesture.

Change-Id: I5ddaf7719e8592571767f341708941acc78c6785
Fixes: 153892412
parent 3908fb22

packages/SystemUI/src/com/android/systemui/Interpolators.java

+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

packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeDepthController.kt

+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)

    }