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

Commit a74c7f66 authored by Lucas Silva's avatar Lucas Silva Committed by Android (Google) Code Review
Browse files

Merge "Update dream blur and fade to match the bouncer scrim" into tm-dev

parents 39a5d5bb c4fe7059

packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayContainerViewController.java

+6 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.util.MathUtils; 
import android.view.View;

import android.view.ViewGroup;



import com.android.keyguard.BouncerPanelExpansionCalculator;

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

import com.android.systemui.dreams.complication.ComplicationHostViewController;

import com.android.systemui.dreams.dagger.DreamOverlayComponent;
@@ -93,9 +94,12 @@ public class DreamOverlayContainerViewController extends ViewController<DreamOve 
                @Override

                public void onExpansionChanged(float bouncerHideAmount) {

                    if (!mBouncerAnimating) return;

                    final float scaledFraction =

                            BouncerPanelExpansionCalculator.getBackScrimScaledExpansion(

                                    bouncerHideAmount);

                    final int blurRadius =

                            (int) mBlurUtils.blurRadiusOfRatio(1 - bouncerHideAmount);

                    updateTransitionState(blurRadius, bouncerHideAmount);

                            (int) mBlurUtils.blurRadiusOfRatio(1 - scaledFraction);

                    updateTransitionState(blurRadius, scaledFraction);

                }



                @Override

packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayContainerViewControllerTest.java

+8 −3
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.view.ViewTreeObserver; 


import androidx.test.filters.SmallTest;



import com.android.keyguard.BouncerPanelExpansionCalculator;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.dreams.complication.ComplicationHostViewController;

import com.android.systemui.statusbar.BlurUtils;
@@ -173,10 +174,14 @@ public class DreamOverlayContainerViewControllerTest extends SysuiTestCase { 
        when(mBlurUtils.blurRadiusOfRatio(anyFloat())).thenReturn(blurRadius);



        bouncerExpansionCaptor.getValue().onStartingToShow();

        final float bouncerHideAmount = 0.1f;



        final float bouncerHideAmount = 0.05f;

        final float scaledFraction =

                BouncerPanelExpansionCalculator.getBackScrimScaledExpansion(bouncerHideAmount);



        bouncerExpansionCaptor.getValue().onExpansionChanged(bouncerHideAmount);

        verify(mBlurUtils).blurRadiusOfRatio(1 - bouncerHideAmount);

        verify(mBlurUtils).blurRadiusOfRatio(1 - scaledFraction);

        verify(mBlurUtils).applyBlur(mViewRoot, (int) blurRadius, false);

        verify(mDreamOverlayContainerView).setAlpha(bouncerHideAmount);

        verify(mDreamOverlayContainerView).setAlpha(scaledFraction);

    }

}