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

Commit 92f5706a authored by Rahul Banerjee's avatar Rahul Banerjee Committed by Android (Google) Code Review
Browse files

Merge "Replace notificationShadeBlur with unified WindowBlurFlag" into main

parents 8edd1b3a 1ac0f0fe

packages/SystemUI/src/com/android/systemui/scrim/ScrimDrawable.java

+1 −3
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.systemui.scrim;



import static com.android.systemui.Flags.notificationShadeBlur;



import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;

import android.animation.ValueAnimator;
@@ -216,7 +214,7 @@ public class ScrimDrawable extends Drawable { 
    public void draw(@NonNull Canvas canvas) {

        mPaint.setColor(mMainColor);

        mPaint.setAlpha(mAlpha);

        if (notificationShadeBlur() || WindowBlurFlag.isEnabled()) {

        if (WindowBlurFlag.isEnabled()) {

            // TODO (b/381263600), wire this at ScrimController, move it to PrimaryBouncerTransition

            mPaint.setAlpha((int) (0.5f * mAlpha));

        }

packages/SystemUI/src/com/android/systemui/scrim/ScrimView.java

+2 −3
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.systemui.scrim;



import static com.android.systemui.Flags.notificationShadeBlur;



import static java.lang.Float.isNaN;



import android.annotation.NonNull;
@@ -44,6 +42,7 @@ import com.android.internal.colorextraction.ColorExtractor; 
import com.android.systemui.res.R;

import com.android.systemui.shade.TouchLogger;

import com.android.systemui.util.LargeScreenUtils;

import com.android.systemui.window.flag.WindowBlurFlag;



import java.util.concurrent.Executor;
@@ -253,7 +252,7 @@ public class ScrimView extends View { 
            if (mBlendWithMainColor) {

                mainTinted = ColorUtils.blendARGB(mColors.getMainColor(), mTintColor, tintAmount);

            }

            if (notificationShadeBlur()) {

            if (WindowBlurFlag.isEnabled()) {

                int layerAbove = ColorUtils.setAlphaComponent(

                        getResources().getColor(R.color.shade_panel, null),

                        (int) (0.4f * 255));