From f03b63d75721fddac741b5dbf1c1aafff126874c Mon Sep 17 00:00:00 2001 From: Kevin Chyn Date: Tue, 11 May 2021 17:30:35 -0700 Subject: [PATCH 1/2] Enlarge UDFPS enrollment progress bar Bug: 187460696 Test: manual Change-Id: Ic7eaddc4951f84cde5ce6e31fcc2fb1bf57c15d7 --- .../com/android/systemui/biometrics/UdfpsEnrollDrawable.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsEnrollDrawable.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsEnrollDrawable.java index cd5abd74c2604..2aa40507bea14 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsEnrollDrawable.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsEnrollDrawable.java @@ -36,7 +36,7 @@ import com.android.systemui.R; public class UdfpsEnrollDrawable extends UdfpsDrawable { private static final String TAG = "UdfpsAnimationEnroll"; - static final float PROGRESS_BAR_RADIUS = 180.f; + static final float PROGRESS_BAR_RADIUS = 360.f; @NonNull private final Drawable mMovingTargetFpIcon; @NonNull private final Paint mSensorOutlinePaint; From 89744e111a295368bc2323fc6708ab6473060056 Mon Sep 17 00:00:00 2001 From: Kevin Chyn Date: Tue, 11 May 2021 18:39:56 -0700 Subject: [PATCH 2/2] Do not show fingerprint icon/circle underneath moving target During enrollment, we have the two elements: 1) Circle and icon on the actual sensor location 2) Moving target, shown after the user enrolled the central location To avoid confusion during the second part of enrollment when the moving target is shown, we should hide the central circle/icon during moving enrollment. Bug: 187460696 Test: manual Change-Id: I2339e80654e0000a56d87901d14a88f8a6a35af1 --- .../android/systemui/biometrics/UdfpsEnrollDrawable.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsEnrollDrawable.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsEnrollDrawable.java index 2aa40507bea14..2c48d0ad8b183 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsEnrollDrawable.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsEnrollDrawable.java @@ -96,11 +96,6 @@ public class UdfpsEnrollDrawable extends UdfpsDrawable { return; } - if (mSensorRect != null) { - canvas.drawOval(mSensorRect, mSensorOutlinePaint); - } - mFingerprintDrawable.draw(canvas); - // Draw moving target if (mEnrollHelper.isCenterEnrollmentComplete()) { mFingerprintDrawable.setAlpha(mAlpha == 255 ? 64 : mAlpha); @@ -117,6 +112,10 @@ public class UdfpsEnrollDrawable extends UdfpsDrawable { mMovingTargetFpIcon.draw(canvas); canvas.restore(); } else { + if (mSensorRect != null) { + canvas.drawOval(mSensorRect, mSensorOutlinePaint); + } + mFingerprintDrawable.draw(canvas); mFingerprintDrawable.setAlpha(mAlpha); mSensorOutlinePaint.setAlpha(mAlpha); }