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

Commit 44ed7ea3 authored by Joshua McCloskey's avatar Joshua McCloskey
Browse files

Added custom bp size.

Test: manual.
Fixes: 232022837
Change-Id: Ibe0ddcdc0c475912a8077168f7b51025813c544a
parent b346a79c
Loading
Loading
Loading
Loading
+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>
+2 −0
Original line number Diff line number Diff line
@@ -956,6 +956,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>

    <!-- Starting text size in sp of batteryLevel for wireless charging animation -->
    <item name="wireless_charging_anim_battery_level_text_size_start" format="float" type="dimen">
+17 −6
Original line number Diff line number Diff line
@@ -168,6 +168,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");
@@ -208,6 +212,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. */
@@ -827,14 +835,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);
    }