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

Commit ea31df38 authored by Milton Wu's avatar Milton Wu Committed by Android (Google) Code Review
Browse files

Merge "Refine udfps enrolling icon" into main

parents 3809fb6f 27039097

src/com/android/settings/biometrics/fingerprint/UdfpsEnrollEnrollingView.java

+2 −1
Original line number Diff line number Diff line
@@ -138,7 +138,8 @@ public class UdfpsEnrollEnrollingView extends GlifLayout { 
                displayInfo.getNaturalWidth(),

                displayInfo.getNaturalHeight(),

                scaleFactor,

                displayInfo.rotation);

                displayInfo.rotation,

                udfpsProps.sensorType);



        mUdfpsEnrollView.setOverlayParams(params);

        mUdfpsEnrollView.setEnrollHelper(udfpsEnrollHelper);

src/com/android/settings/biometrics/fingerprint/UdfpsEnrollView.java

+4 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.settings.biometrics.fingerprint; 
import android.content.Context;

import android.graphics.Rect;

import android.graphics.RectF;

import android.hardware.fingerprint.FingerprintSensorProperties;

import android.os.Handler;

import android.os.Looper;

import android.util.AttributeSet;
@@ -202,7 +203,9 @@ public class UdfpsEnrollView extends FrameLayout implements UdfpsEnrollHelper.Li 
    }



    private void onFingerDown() {

        if (mOverlayParams.getSensorType() == FingerprintSensorProperties.TYPE_UDFPS_OPTICAL) {

            mFingerprintDrawable.setShouldSkipDraw(true);

        }

        mFingerprintDrawable.invalidateSelf();

    }

src/com/android/settings/biometrics2/ui/widget/UdfpsEnrollView.java

+2 −2
Original line number Diff line number Diff line
@@ -260,8 +260,8 @@ public class UdfpsEnrollView extends FrameLayout { 
                displayInfo.getNaturalWidth(),

                displayInfo.getNaturalHeight(),

                scaleFactor,

                displayInfo.rotation);



                displayInfo.rotation,

                mSensorProperties.sensorType);



        post(() -> {

            mProgressBarRadius =