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

Commit 03496f1e authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use 0 as the min blur radius for the new blur features" into main

parents 643400a3 454e3b45

packages/SystemUI/src/com/android/systemui/keyguard/dagger/KeyguardModule.java

+1 −2
Original line number Diff line number Diff line
@@ -247,14 +247,13 @@ public interface KeyguardModule { 
    @Provides

    @SysUISingleton

    static BlurConfig provideBlurConfig(@Main Resources resources) {

        int minBlurRadius = resources.getDimensionPixelSize(R.dimen.min_window_blur_radius);

        int maxBlurRadius =

                Flags.notificationShadeBlur() || Flags.bouncerUiRevamp()

                        || Flags.glanceableHubBlurredBackground()

                        ? resources.getDimensionPixelSize(R.dimen.max_shade_window_blur_radius)

                        : resources.getDimensionPixelSize(R.dimen.max_window_blur_radius);



        return new BlurConfig(minBlurRadius, maxBlurRadius);

        return new BlurConfig(0.0f, maxBlurRadius);

    }



    /** */

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

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ open class BlurUtils @Inject constructor( 
    private val crossWindowBlurListeners: CrossWindowBlurListeners,

    dumpManager: DumpManager

) : Dumpable {

    val minBlurRadius = blurConfig.minBlurRadiusPx

    val minBlurRadius = resources.getDimensionPixelSize(R.dimen.min_window_blur_radius).toFloat();

    val maxBlurRadius = if (Flags.notificationShadeBlur()) {

        blurConfig.maxBlurRadiusPx

    } else {