diff options
2 files changed, 14 insertions, 5 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayContainerViewController.java b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayContainerViewController.java index 330bd6cb8281..456119068b93 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayContainerViewController.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayContainerViewController.java @@ -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 diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayContainerViewControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayContainerViewControllerTest.java index fa6288fb428c..76f6529e3894 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayContainerViewControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayContainerViewControllerTest.java @@ -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); } } |