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

Commit 178fe078 authored by Joshua Mccloskey's avatar Joshua Mccloskey Committed by Automerger Merge Worker
Browse files

Merge "Added udfps enroll coordinates" into sc-dev am: 5c3cd507 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13959733

Change-Id: I565f977c5d63a476923ff66dbc52b91da15286a7
parents 7dd3016e 5c3cd507

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

+40 −15
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.hardware.fingerprint.IUdfpsOverlayController; 
import android.os.Build;

import android.os.UserHandle;

import android.provider.Settings;

import android.util.Log;

import android.util.TypedValue;



import java.util.ArrayList;
@@ -39,6 +40,9 @@ public class UdfpsEnrollHelper { 
            "com.android.systemui.biometrics.UdfpsEnrollHelper.scale";

    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

    private static final int NUM_CENTER_TOUCHES = 2;
@@ -68,7 +72,27 @@ public class UdfpsEnrollHelper { 
        // Number of pixels per mm

        float px = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_MM, 1,

                context.getResources().getDisplayMetrics());



        boolean useNewCoords = Settings.Secure.getIntForUser(mContext.getContentResolver(),

                NEW_COORDS_OVERRIDE, 0,

                UserHandle.USER_CURRENT) != 0;

        if (useNewCoords && (Build.IS_ENG || Build.IS_USERDEBUG)) {

            Log.v(TAG, "Using new coordinates");

            mGuidedEnrollmentPoints.add(new PointF(-0.15f * px, -1.02f * px));

            mGuidedEnrollmentPoints.add(new PointF(-0.15f * px,  1.02f * px));

            mGuidedEnrollmentPoints.add(new PointF( 0.29f * px,  0.00f * px));

            mGuidedEnrollmentPoints.add(new PointF( 2.17f * px, -2.35f * px));

            mGuidedEnrollmentPoints.add(new PointF( 1.07f * px, -3.96f * px));

            mGuidedEnrollmentPoints.add(new PointF(-0.37f * px, -4.31f * px));

            mGuidedEnrollmentPoints.add(new PointF(-1.69f * px, -3.29f * px));

            mGuidedEnrollmentPoints.add(new PointF(-2.48f * px, -1.23f * px));

            mGuidedEnrollmentPoints.add(new PointF(-2.48f * px,  1.23f * 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));
@@ -84,6 +108,7 @@ public class UdfpsEnrollHelper { 
            mGuidedEnrollmentPoints.add(new PointF( 2.29f * px,  4.92f * px));

            mGuidedEnrollmentPoints.add(new PointF( 3.82f * px,  1.78f * px));

        }

    }



    boolean shouldShowProgressBar() {

        return mEnrollReason == IUdfpsOverlayController.REASON_ENROLL_ENROLLING;