Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17351485

Change-Id: I1dc3e5b2cebffec37cb08b58f3abfc164a50b28c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Lucas Silva
2022-03-25 17:34:12 +00:00
committed by Automerger Merge Worker
parent b438616b1c dd7c3c3b0c
commit 242eb9cdd8
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayContainerViewController.java
View File

@@ -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

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

@@ -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);
}
}