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

Commit d5d20e06 authored by Lucas Dupin's avatar Lucas Dupin Committed by Automerger Merge Worker
Browse files

Merge "Added custom bp size." into tm-qpr-dev am: 27693c91 am: c670e525 

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



Change-Id: Ib2a3682f059f706429c2945a11663dfb666448e9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e7f3fd57 c670e525

packages/SystemUI/res/values/bools.xml

+2 −0
Original line number Diff line number Diff line
@@ -18,4 +18,6 @@ 
<resources>

    <!-- Whether to show the user switcher in quick settings when only a single user is present. -->

    <bool name="qs_show_user_switcher_for_single_user">false</bool>

    <!-- Whether to show a custom biometric prompt size-->

    <bool name="use_custom_bp_size">false</bool>

</resources>

packages/SystemUI/res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -945,6 +945,8 @@ 
    <dimen name="biometric_dialog_medium_to_large_translation_offset">100dp</dimen>

    <!-- Y translation for credential contents when animating in -->

    <dimen name="biometric_dialog_credential_translation_offset">60dp</dimen>

    <dimen name="biometric_dialog_width">240dp</dimen>

    <dimen name="biometric_dialog_height">240dp</dimen>



    <!-- Biometric Auth Credential values -->

    <dimen name="biometric_auth_icon_size">48dp</dimen>

packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricView.java

+17 −6
Original line number Diff line number Diff line
@@ -169,6 +169,10 @@ public abstract class AuthBiometricView extends LinearLayout { 


    private Animator.AnimatorListener mJankListener;



    private final boolean mUseCustomBpSize;

    private final int mCustomBpWidth;

    private final int mCustomBpHeight;



    private final OnClickListener mBackgroundClickListener = (view) -> {

        if (mState == STATE_AUTHENTICATED) {

            Log.w(TAG, "Ignoring background click after authenticated");
@@ -209,6 +213,10 @@ public abstract class AuthBiometricView extends LinearLayout { 
            handleResetAfterHelp();

            Utils.notifyAccessibilityContentChanged(mAccessibilityManager, this);

        };



        mUseCustomBpSize = getResources().getBoolean(R.bool.use_custom_bp_size);

        mCustomBpWidth = getResources().getDimensionPixelSize(R.dimen.biometric_dialog_width);

        mCustomBpHeight = getResources().getDimensionPixelSize(R.dimen.biometric_dialog_height);

    }



    /** Delay after authentication is confirmed, before the dialog should be animated away. */
@@ -834,14 +842,17 @@ public abstract class AuthBiometricView extends LinearLayout { 


    @Override

    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {

        final int width = MeasureSpec.getSize(widthMeasureSpec);

        final int height = MeasureSpec.getSize(heightMeasureSpec);

        int width = MeasureSpec.getSize(widthMeasureSpec);

        int height = MeasureSpec.getSize(heightMeasureSpec);



        final int newWidth = Math.min(width, height);

        if (mUseCustomBpSize) {

            width = mCustomBpWidth;

            height = mCustomBpHeight;

        } else {

            width = Math.min(width, height);

        }



        // Use "newWidth" instead, so the landscape dialog width is the same as the portrait

        // width.

        mLayoutParams = onMeasureInternal(newWidth, height);

        mLayoutParams = onMeasureInternal(width, height);

        setMeasuredDimension(mLayoutParams.mMediumWidth, mLayoutParams.mMediumHeight);

    }