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

Commit b1939d1f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update fingerprint icon layout size" into tm-d1-dev am: 032ed256 am:... 

Merge "Update fingerprint icon layout size" into tm-d1-dev am: 032ed256 am: 41b3f5fb am: 7ecc90fb

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



Change-Id: I6c04ec53842827c9c6d7067d21e5ec24b95afec3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fef67a93 7ecc90fb

packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricFingerprintIconController.kt

+11 −3
Original line number Diff line number Diff line
@@ -36,12 +36,20 @@ open class AuthBiometricFingerprintIconController( 
    iconView: ImageView

) : AuthIconController(context, iconView) {



    var iconLayoutParamsSize = 0

        set(value) {

            if (field == value) {

                return

            }

            iconView.layoutParams.width = value

            iconView.layoutParams.height = value

            field = value

        }



    init {

        val size = context.resources.getDimensionPixelSize(

        iconLayoutParamsSize = context.resources.getDimensionPixelSize(

            R.dimen.biometric_dialog_fingerprint_icon_size

        )

        iconView.layoutParams.width = size

        iconView.layoutParams.height = size

    }



    override fun updateIcon(@BiometricState lastState: Int, @BiometricState newState: Int) {

packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricFingerprintView.kt

+7 −0
Original line number Diff line number Diff line
@@ -88,6 +88,13 @@ open class AuthBiometricFingerprintView( 
    override fun createIconController(): AuthIconController =

        AuthBiometricFingerprintIconController(mContext, mIconView)



    fun updateOverrideIconLayoutParamsSize() {

        udfpsAdapter?.let {

            (mIconController as? AuthBiometricFingerprintIconController)?.iconLayoutParamsSize =

                    it.getSensorDiameter(scaleFactorProvider?.provide() ?: 1.0f)

        }

    }



    override fun onAttachedToWindow() {

        super.onAttachedToWindow()

        showTouchSensorString()

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

+2 −0
Original line number Diff line number Diff line
@@ -320,6 +320,7 @@ public class AuthContainerView extends LinearLayout 
                                R.layout.auth_biometric_fingerprint_and_face_view, null, false);

                fingerprintAndFaceView.setSensorProperties(fpProperties);

                fingerprintAndFaceView.setScaleFactorProvider(config.mScaleProvider);

                fingerprintAndFaceView.updateOverrideIconLayoutParamsSize();

                mBiometricView = fingerprintAndFaceView;

            } else if (fpProperties != null) {

                final AuthBiometricFingerprintView fpView =
@@ -327,6 +328,7 @@ public class AuthContainerView extends LinearLayout 
                                R.layout.auth_biometric_fingerprint_view, null, false);

                fpView.setSensorProperties(fpProperties);

                fpView.setScaleFactorProvider(config.mScaleProvider);

                fpView.updateOverrideIconLayoutParamsSize();

                mBiometricView = fpView;

            } else if (faceProperties != null) {

                mBiometricView = (AuthBiometricFaceView) layoutInflater.inflate(

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

+9 −4
Original line number Diff line number Diff line
@@ -90,6 +90,13 @@ public class UdfpsDialogMeasureAdapter { 
        return mBottomSpacerHeight;

    }



    /**

     * @return sensor diameter size as scaleFactor

     */

    public int getSensorDiameter(float scaleFactor) {

        return (int) (scaleFactor * mSensorProps.getLocation().sensorRadius * 2);

    }



    @NonNull

    private AuthDialog.LayoutParams onMeasureInternalPortrait(int width, int height,

            float scaleFactor) {
@@ -108,8 +115,7 @@ public class UdfpsDialogMeasureAdapter { 
        // Go through each of the children and do the custom measurement.

        int totalHeight = 0;

        final int numChildren = mView.getChildCount();

        final int sensorDiameter =

                (int) (scaleFactor * mSensorProps.getLocation().sensorRadius * 2);

        final int sensorDiameter = getSensorDiameter(scaleFactor);

        for (int i = 0; i < numChildren; i++) {

            final View child = mView.getChildAt(i);

            if (child.getId() == R.id.biometric_icon_frame) {
@@ -203,8 +209,7 @@ public class UdfpsDialogMeasureAdapter { 
        final int horizontalSpacerWidth = calculateHorizontalSpacerWidthForLandscape(

                mSensorProps, displayWidth, dialogMargin, horizontalInset, scaleFactor);



        final int sensorDiameter =

                (int) (scaleFactor * mSensorProps.getLocation().sensorRadius * 2);

        final int sensorDiameter = getSensorDiameter(scaleFactor);

        final int remeasuredWidth = sensorDiameter + 2 * horizontalSpacerWidth;



        int remeasuredHeight = 0;