Merge "Refine udfps enrolling icon" into main

This commit is contained in:
Milton Wu
2024-01-09 02:10:37 +00:00
committed by Android (Google) Code Review
3 changed files with 8 additions and 4 deletions

View File

@@ -138,7 +138,8 @@ public class UdfpsEnrollEnrollingView extends GlifLayout {
displayInfo.getNaturalWidth(), displayInfo.getNaturalWidth(),
displayInfo.getNaturalHeight(), displayInfo.getNaturalHeight(),
scaleFactor, scaleFactor,
displayInfo.rotation); displayInfo.rotation,
udfpsProps.sensorType);
mUdfpsEnrollView.setOverlayParams(params); mUdfpsEnrollView.setOverlayParams(params);
mUdfpsEnrollView.setEnrollHelper(udfpsEnrollHelper); mUdfpsEnrollView.setEnrollHelper(udfpsEnrollHelper);

View File

@@ -19,6 +19,7 @@ package com.android.settings.biometrics.fingerprint;
import android.content.Context; import android.content.Context;
import android.graphics.Rect; import android.graphics.Rect;
import android.graphics.RectF; import android.graphics.RectF;
import android.hardware.fingerprint.FingerprintSensorProperties;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.util.AttributeSet; import android.util.AttributeSet;
@@ -202,7 +203,9 @@ public class UdfpsEnrollView extends FrameLayout implements UdfpsEnrollHelper.Li
} }
private void onFingerDown() { private void onFingerDown() {
mFingerprintDrawable.setShouldSkipDraw(true); if (mOverlayParams.getSensorType() == FingerprintSensorProperties.TYPE_UDFPS_OPTICAL) {
mFingerprintDrawable.setShouldSkipDraw(true);
}
mFingerprintDrawable.invalidateSelf(); mFingerprintDrawable.invalidateSelf();
} }

View File

@@ -260,8 +260,8 @@ public class UdfpsEnrollView extends FrameLayout {
displayInfo.getNaturalWidth(), displayInfo.getNaturalWidth(),
displayInfo.getNaturalHeight(), displayInfo.getNaturalHeight(),
scaleFactor, scaleFactor,
displayInfo.rotation); displayInfo.rotation,
mSensorProperties.sensorType);
post(() -> { post(() -> {
mProgressBarRadius = mProgressBarRadius =