Merge "Add prop to test various enrollment scaling" into sc-dev (aef42e77) · Commits · e / os / android_frameworks_base

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

+17 −2

Original line number	Original line	Diff line number	Diff line
	@@ -21,6 +21,9 @@ import android.annotation.Nullable;
	import android.content.Context;		import android.content.Context;
	import android.graphics.PointF;		import android.graphics.PointF;
	import android.hardware.fingerprint.IUdfpsOverlayController;		import android.hardware.fingerprint.IUdfpsOverlayController;
			import android.os.Build;
			import android.os.UserHandle;
			import android.provider.Settings;
	import android.util.TypedValue;		import android.util.TypedValue;

	import java.util.ArrayList;		import java.util.ArrayList;
	@@ -32,6 +35,10 @@ import java.util.List;
	public class UdfpsEnrollHelper {		public class UdfpsEnrollHelper {
	private static final String TAG = "UdfpsEnrollHelper";		private static final String TAG = "UdfpsEnrollHelper";

			private static final String SCALE_OVERRIDE =
			"com.android.systemui.biometrics.UdfpsEnrollHelper.scale";
			private static final float SCALE = 0.5f;

	// 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;

	@@ -39,9 +46,10 @@ public class UdfpsEnrollHelper {
	void onEnrollmentProgress(int remaining, int totalSteps);		void onEnrollmentProgress(int remaining, int totalSteps);
	}		}

			@NonNull private final Context mContext;
	// IUdfpsOverlayController reason		// IUdfpsOverlayController reason
	private final int mEnrollReason;		private final int mEnrollReason;
	private final List<PointF> mGuidedEnrollmentPoints;		@NonNull private final List<PointF> mGuidedEnrollmentPoints;

	private int mTotalSteps = -1;		private int mTotalSteps = -1;
	private int mRemainingSteps = -1;		private int mRemainingSteps = -1;
	@@ -53,6 +61,7 @@ public class UdfpsEnrollHelper {
	@Nullable Listener mListener;		@Nullable Listener mListener;

	public UdfpsEnrollHelper(@NonNull Context context, int reason) {		public UdfpsEnrollHelper(@NonNull Context context, int reason) {
			mContext = context;
	mEnrollReason = reason;		mEnrollReason = reason;
	mGuidedEnrollmentPoints = new ArrayList<>();		mGuidedEnrollmentPoints = new ArrayList<>();

	@@ -121,9 +130,15 @@ public class UdfpsEnrollHelper {

	@NonNull		@NonNull
	PointF getNextGuidedEnrollmentPoint() {		PointF getNextGuidedEnrollmentPoint() {
			float scale = SCALE;
			if (Build.IS_ENG \|\| Build.IS_USERDEBUG) {
			scale = Settings.Secure.getFloatForUser(mContext.getContentResolver(),
			SCALE_OVERRIDE, SCALE,
			UserHandle.USER_CURRENT);
			}
	final int index = mLocationsEnrolled - NUM_CENTER_TOUCHES;		final int index = mLocationsEnrolled - NUM_CENTER_TOUCHES;
	final PointF originalPoint = mGuidedEnrollmentPoints		final PointF originalPoint = mGuidedEnrollmentPoints
	.get(index % mGuidedEnrollmentPoints.size());		.get(index % mGuidedEnrollmentPoints.size());
	return new PointF(originalPoint.x * 0.5f, originalPoint.y * 0.5f);		return new PointF(originalPoint.x * scale, originalPoint.y * scale);
	}		}
	}		}