Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Added udfps enroll coordinates" into sc-dev

Browse Source
This commit is contained in:
Joshua Mccloskey
2021-03-23 20:48:02 +00:00
committed by Android (Google) Code Review
parent 3a38f4572e f1038cf618
commit 5c3cd50754
1 changed files with 40 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
packages/SystemUI/src/com/android/systemui/biometrics/UdfpsEnrollHelper.java
View File

@@ -24,6 +24,7 @@ import android.hardware.fingerprint.IUdfpsOverlayController;
import android.os.Build; import android.os.Build;
import android.os.UserHandle; import android.os.UserHandle;
import android.provider.Settings; import android.provider.Settings;
import android.util.Log;
import android.util.TypedValue; import android.util.TypedValue;
import java.util.ArrayList; import java.util.ArrayList;
@@ -39,6 +40,9 @@ public class UdfpsEnrollHelper {
"com.android.systemui.biometrics.UdfpsEnrollHelper.scale"; "com.android.systemui.biometrics.UdfpsEnrollHelper.scale";
private static final float SCALE = 0.5f; private static final float SCALE = 0.5f;
private static final String NEW_COORDS_OVERRIDE =
"com.android.systemui.biometrics.UdfpsNewCoords";
// Enroll with two center touches before going to guided enrollment // Enroll with two center touches before going to guided enrollment
private static final int NUM_CENTER_TOUCHES = 2; private static final int NUM_CENTER_TOUCHES = 2;
@@ -68,21 +72,42 @@ public class UdfpsEnrollHelper {
// Number of pixels per mm // Number of pixels per mm
float px = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_MM, 1, float px = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_MM, 1,
context.getResources().getDisplayMetrics()); context.getResources().getDisplayMetrics());
boolean useNewCoords = Settings.Secure.getIntForUser(mContext.getContentResolver(),
mGuidedEnrollmentPoints.add(new PointF( 2.00f * px, 0.00f * px)); NEW_COORDS_OVERRIDE, 0,
mGuidedEnrollmentPoints.add(new PointF( 0.87f * px, -2.70f * px)); UserHandle.USER_CURRENT) != 0;
mGuidedEnrollmentPoints.add(new PointF(-1.80f * px, -1.31f * px)); if (useNewCoords && (Build.IS_ENG || Build.IS_USERDEBUG)) {
mGuidedEnrollmentPoints.add(new PointF(-1.80f * px, 1.31f * px)); Log.v(TAG, "Using new coordinates");
mGuidedEnrollmentPoints.add(new PointF( 0.88f * px, 2.70f * px)); mGuidedEnrollmentPoints.add(new PointF(-0.15f * px, -1.02f * px));
mGuidedEnrollmentPoints.add(new PointF( 3.94f * px, -1.06f * px)); mGuidedEnrollmentPoints.add(new PointF(-0.15f * px, 1.02f * px));
mGuidedEnrollmentPoints.add(new PointF( 2.90f * px, -4.14f * px)); mGuidedEnrollmentPoints.add(new PointF( 0.29f * px, 0.00f * px));
mGuidedEnrollmentPoints.add(new PointF(-0.52f * px, -5.95f * px)); mGuidedEnrollmentPoints.add(new PointF( 2.17f * px, -2.35f * px));
mGuidedEnrollmentPoints.add(new PointF(-3.33f * px, -3.33f * px)); mGuidedEnrollmentPoints.add(new PointF( 1.07f * px, -3.96f * px));
mGuidedEnrollmentPoints.add(new PointF(-3.99f * px, -0.35f * px)); mGuidedEnrollmentPoints.add(new PointF(-0.37f * px, -4.31f * px));
mGuidedEnrollmentPoints.add(new PointF(-3.62f * px, 2.54f * px)); mGuidedEnrollmentPoints.add(new PointF(-1.69f * px, -3.29f * px));
mGuidedEnrollmentPoints.add(new PointF(-1.49f * px, 5.57f * px)); mGuidedEnrollmentPoints.add(new PointF(-2.48f * px, -1.23f * px));
mGuidedEnrollmentPoints.add(new PointF( 2.29f * px, 4.92f * px)); mGuidedEnrollmentPoints.add(new PointF(-2.48f * px, 1.23f * px));
mGuidedEnrollmentPoints.add(new PointF( 3.82f * px, 1.78f * px)); mGuidedEnrollmentPoints.add(new PointF(-1.69f * px, 3.29f * px));
mGuidedEnrollmentPoints.add(new PointF(-0.37f * px, 4.31f * px));
mGuidedEnrollmentPoints.add(new PointF( 1.07f * px, 3.96f * px));
mGuidedEnrollmentPoints.add(new PointF( 2.17f * px, 2.35f * px));
mGuidedEnrollmentPoints.add(new PointF( 2.58f * px, 0.00f * px));
} else {
Log.v(TAG, "Using old coordinates");
mGuidedEnrollmentPoints.add(new PointF( 2.00f * px, 0.00f * px));
mGuidedEnrollmentPoints.add(new PointF( 0.87f * px, -2.70f * px));
mGuidedEnrollmentPoints.add(new PointF(-1.80f * px, -1.31f * px));
mGuidedEnrollmentPoints.add(new PointF(-1.80f * px, 1.31f * px));
mGuidedEnrollmentPoints.add(new PointF( 0.88f * px, 2.70f * px));
mGuidedEnrollmentPoints.add(new PointF( 3.94f * px, -1.06f * px));
mGuidedEnrollmentPoints.add(new PointF( 2.90f * px, -4.14f * px));
mGuidedEnrollmentPoints.add(new PointF(-0.52f * px, -5.95f * px));
mGuidedEnrollmentPoints.add(new PointF(-3.33f * px, -3.33f * px));
mGuidedEnrollmentPoints.add(new PointF(-3.99f * px, -0.35f * px));
mGuidedEnrollmentPoints.add(new PointF(-3.62f * px, 2.54f * px));
mGuidedEnrollmentPoints.add(new PointF(-1.49f * px, 5.57f * px));
mGuidedEnrollmentPoints.add(new PointF( 2.29f * px, 4.92f * px));
mGuidedEnrollmentPoints.add(new PointF( 3.82f * px, 1.78f * px));
}
} }
boolean shouldShowProgressBar() { boolean shouldShowProgressBar() {