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

Commit 4057dd1b authored by Chandru S's avatar Chandru S Committed by Android (Google) Code Review
Browse files

Merge changes I36434917,Ife22b7a4 into main 

* changes:
  Revert scrimView and scrimDrawable changes for notification blur
  Remove WindowBlurFlag helper method.
parents 764efad9 a1993b32

packages/SystemUI/src/com/android/systemui/keyguard/dagger/PrimaryBouncerTransitionModule.kt

+2 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.systemui.keyguard.dagger



import android.content.res.Resources

import com.android.systemui.Flags

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Main

import com.android.systemui.keyguard.ui.transitions.BlurConfig
@@ -34,7 +35,6 @@ import com.android.systemui.keyguard.ui.viewmodel.PrimaryBouncerToGoneTransition 
import com.android.systemui.keyguard.ui.viewmodel.PrimaryBouncerToLockscreenTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.PrimaryBouncerToOccludedTransitionViewModel

import com.android.systemui.res.R

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

import dagger.Binds

import dagger.Module

import dagger.Provides
@@ -56,7 +56,7 @@ interface PrimaryBouncerTransitionModule { 
        fun provideBlurConfig(@Main resources: Resources): BlurConfig {

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

            val maxBlurRadius =

                if (WindowBlurFlag.isEnabled) {

                if (Flags.notificationShadeBlur() || Flags.bouncerUiRevamp()) {

                    resources.getDimensionPixelSize(R.dimen.max_shade_window_blur_radius)

                } else {

                    resources.getDimensionPixelSize(R.dimen.max_window_blur_radius)

packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AlternateBouncerToPrimaryBouncerTransitionViewModel.kt

+1 −2
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import com.android.systemui.keyguard.ui.transitions.PrimaryBouncerTransition 
import com.android.systemui.scene.shared.flag.SceneContainerFlag

import com.android.systemui.scene.shared.model.Scenes

import com.android.systemui.scene.ui.composable.transitions.TO_BOUNCER_FADE_FRACTION

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

import javax.inject.Inject

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.flow.Flow
@@ -73,7 +72,7 @@ constructor( 
            onStep = alphaForAnimationStep,

        )



    val lockscreenAlpha: Flow<Float> = if (WindowBlurFlag.isEnabled) alphaFlow else emptyFlow()

    val lockscreenAlpha: Flow<Float> = if (Flags.bouncerUiRevamp()) alphaFlow else emptyFlow()



    val notificationAlpha: Flow<Float> =

        if (Flags.bouncerUiRevamp()) {

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

+0 −5
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import android.view.animation.DecelerateInterpolator; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.graphics.ColorUtils;

import com.android.systemui.statusbar.notification.stack.StackStateAnimator;

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



/**

 * Drawable used on SysUI scrims.
@@ -214,10 +213,6 @@ public class ScrimDrawable extends Drawable { 
    public void draw(@NonNull Canvas canvas) {

        mPaint.setColor(mMainColor);

        mPaint.setAlpha(mAlpha);

        if (WindowBlurFlag.isEnabled()) {

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

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

        }

        if (mConcaveInfo != null) {

            drawConcave(canvas);

        } else if (mCornerRadiusEnabled && mCornerRadius > 0) {

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

+0 −9
Original line number Diff line number Diff line
@@ -39,10 +39,8 @@ import androidx.core.graphics.ColorUtils; 
import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

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;
@@ -252,13 +250,6 @@ public class ScrimView extends View { 
            if (mBlendWithMainColor) {

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

            }

            if (WindowBlurFlag.isEnabled()) {

                int layerAbove = ColorUtils.setAlphaComponent(

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

                        (int) (0.4f * 255));

                int layerBelow = ColorUtils.setAlphaComponent(Color.WHITE, (int) (0.1f * 255));

                mainTinted = ColorUtils.compositeColors(layerAbove, layerBelow);

            }

            drawable.setColor(mainTinted, animated);

        } else {

            boolean hasAlpha = Color.alpha(mTintColor) != 0;

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

+8 −5
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import androidx.dynamicanimation.animation.SpringForce 
import com.android.app.animation.Interpolators

import com.android.app.tracing.coroutines.TrackTracer

import com.android.systemui.Dumpable

import com.android.systemui.Flags

import com.android.systemui.Flags.spatialModelAppPushback

import com.android.systemui.animation.ShadeInterpolation

import com.android.systemui.dagger.SysUISingleton
@@ -52,8 +53,8 @@ import com.android.systemui.statusbar.policy.KeyguardStateController 
import com.android.systemui.statusbar.policy.SplitShadeStateController

import com.android.systemui.util.WallpaperController

import com.android.systemui.window.domain.interactor.WindowRootViewBlurInteractor

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

import com.android.wm.shell.appzoomout.AppZoomOut



import java.io.PrintWriter

import java.util.Optional

import javax.inject.Inject
@@ -230,7 +231,7 @@ constructor( 
        val zoomOut = blurRadiusToZoomOut(blurRadius = shadeRadius)

        // Make blur be 0 if it is necessary to stop blur effect.

        if (scrimsVisible) {

            if (!WindowBlurFlag.isEnabled) {

            if (!Flags.notificationShadeBlur()) {

                blur = 0

            }

        }
@@ -258,7 +259,9 @@ constructor( 
    }



    private val shouldBlurBeOpaque: Boolean

        get() = if (WindowBlurFlag.isEnabled) false else scrimsVisible && !blursDisabledForAppLaunch

        get() =

            if (Flags.notificationShadeBlur()) false

            else scrimsVisible && !blursDisabledForAppLaunch



    /** Callback that updates the window blur value and is called only once per frame. */

    @VisibleForTesting
@@ -388,7 +391,7 @@ constructor( 
    }



    private fun initBlurListeners() {

        if (!WindowBlurFlag.isEnabled) return

        if (!Flags.bouncerUiRevamp()) return



        applicationScope.launch {

            Log.d(TAG, "Starting coroutines for window root view blur")
@@ -523,7 +526,7 @@ constructor( 
    private fun scheduleUpdate() {

        val (blur, zoomOutFromShadeRadius) = computeBlurAndZoomOut()

        zoomOutCalculatedFromShadeRadius = zoomOutFromShadeRadius

        if (WindowBlurFlag.isEnabled) {

        if (Flags.bouncerUiRevamp()) {

            updateScheduled =

                windowRootViewBlurInteractor.requestBlurForShade(blur, shouldBlurBeOpaque)

            return