diff options
4 files changed, 25 insertions, 3 deletions
diff --git a/packages/SystemUI/res/layout/auth_container_view.xml b/packages/SystemUI/res/layout/auth_container_view.xml index 3db01a4e7f3a..2bd2e640127e 100644 --- a/packages/SystemUI/res/layout/auth_container_view.xml +++ b/packages/SystemUI/res/layout/auth_container_view.xml @@ -23,7 +23,6 @@ android:id="@+id/background" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/biometric_dialog_dim_color" android:contentDescription="@string/biometric_dialog_empty_space_description"/> <View diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml index ccf18d2a0bb1..1eece4cee179 100644 --- a/packages/SystemUI/res/values/colors.xml +++ b/packages/SystemUI/res/values/colors.xml @@ -129,7 +129,6 @@ <color name="smart_reply_button_stroke">@*android:color/accent_device_default</color> <!-- Biometric dialog colors --> - <color name="biometric_dialog_dim_color">#80000000</color> <!-- 50% black --> <color name="biometric_dialog_gray">#ff757575</color> <color name="biometric_dialog_accent">@color/material_dynamic_primary40</color> <color name="biometric_dialog_error">#ffd93025</color> <!-- red 600 --> diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java index bc1c5f4baceb..c9cc3e29f68e 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java @@ -90,6 +90,8 @@ public class AuthContainerView extends LinearLayout private static final int STATE_ANIMATING_OUT = 4; private static final int STATE_GONE = 5; + private static final float BACKGROUND_DIM_AMOUNT = 0.5f; + /** Shows biometric prompt dialog animation. */ private static final String SHOW = "show"; /** Dismiss biometric prompt dialog animation. */ @@ -754,6 +756,16 @@ public class AuthContainerView extends LinearLayout .setDuration(animateDuration) .setInterpolator(mLinearOutSlowIn) .setListener(getJankListener(this, DISMISS, animateDuration)) + .setUpdateListener(animation -> { + if (mWindowManager == null || getViewRootImpl() == null) { + Log.w(TAG, "skip updateViewLayout() for dim animation."); + return; + } + final WindowManager.LayoutParams lp = getViewRootImpl().mWindowAttributes; + lp.dimAmount = (1.0f - (Float) animation.getAnimatedValue()) + * BACKGROUND_DIM_AMOUNT; + mWindowManager.updateViewLayout(this, lp); + }) .withLayer() .start(); }); @@ -800,7 +812,8 @@ public class AuthContainerView extends LinearLayout @VisibleForTesting static WindowManager.LayoutParams getLayoutParams(IBinder windowToken, CharSequence title) { final int windowFlags = WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED - | WindowManager.LayoutParams.FLAG_SECURE; + | WindowManager.LayoutParams.FLAG_SECURE + | WindowManager.LayoutParams.FLAG_DIM_BEHIND; final WindowManager.LayoutParams lp = new WindowManager.LayoutParams( ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT, @@ -811,6 +824,7 @@ public class AuthContainerView extends LinearLayout lp.setFitInsetsTypes(lp.getFitInsetsTypes() & ~WindowInsets.Type.ime()); lp.setTitle("BiometricPrompt"); lp.accessibilityTitle = title; + lp.dimAmount = BACKGROUND_DIM_AMOUNT; lp.token = windowToken; return lp; } diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthContainerViewTest.kt b/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthContainerViewTest.kt index bc5a4d3d274e..bc0d76e4a101 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthContainerViewTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthContainerViewTest.kt @@ -297,6 +297,16 @@ class AuthContainerViewTest : SysuiTestCase() { } @Test + fun testLayoutParams_hasDimbehindWindowFlag() { + val layoutParams = AuthContainerView.getLayoutParams(windowToken, "") + val lpFlags = layoutParams.flags + val lpDimAmount = layoutParams.dimAmount + + assertThat((lpFlags and WindowManager.LayoutParams.FLAG_DIM_BEHIND) != 0).isTrue() + assertThat(lpDimAmount).isGreaterThan(0f) + } + + @Test fun testLayoutParams_excludesImeInsets() { val layoutParams = AuthContainerView.getLayoutParams(windowToken, "") assertThat((layoutParams.fitInsetsTypes and WindowInsets.Type.ime()) == 0).isTrue() |