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

Commit e84f1c22 authored by Kevin Chyn's avatar Kevin Chyn Committed by Automerger Merge Worker
Browse files

Merge changes I9761c313,I25dacbfa into sc-dev am: f7b45b69 

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

Change-Id: I95bfb176e3d9a9aad701941da71351cb776f53dd
parents 6cf8d801 f7b45b69

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

+8 −0
Original line number Diff line number Diff line
@@ -630,6 +630,14 @@ public class UdfpsController implements DozeReceiver { 
                    animation.init();

                    mView.setAnimationViewController(animation);



                    // This view overlaps the sensor area, so prevent it from being selectable

                    // during a11y.

                    if (reason == IUdfpsOverlayController.REASON_ENROLL_FIND_SENSOR

                            || reason == IUdfpsOverlayController.REASON_ENROLL_ENROLLING) {

                        mView.setImportantForAccessibility(

                                View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);

                    }



                    mWindowManager.addView(mView, computeLayoutParams(animation));

                    mAccessibilityManager.addTouchExplorationStateChangeListener(

                            mTouchExplorationStateChangeListener);

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

+12 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.os.UserHandle; 
import android.provider.Settings;

import android.util.Log;

import android.util.TypedValue;

import android.view.accessibility.AccessibilityManager;



import java.util.ArrayList;

import java.util.List;
@@ -53,6 +54,7 @@ public class UdfpsEnrollHelper { 
    @NonNull private final Context mContext;

    // IUdfpsOverlayController reason

    private final int mEnrollReason;

    private final boolean mAccessibilityEnabled;

    @NonNull private final List<PointF> mGuidedEnrollmentPoints;



    private int mTotalSteps = -1;
@@ -67,6 +69,10 @@ public class UdfpsEnrollHelper { 
    public UdfpsEnrollHelper(@NonNull Context context, int reason) {

        mContext = context;

        mEnrollReason = reason;



        final AccessibilityManager am = context.getSystemService(AccessibilityManager.class);

        mAccessibilityEnabled = am.isEnabled();



        mGuidedEnrollmentPoints = new ArrayList<>();



        // Number of pixels per mm
@@ -148,6 +154,8 @@ public class UdfpsEnrollHelper { 
    boolean isCenterEnrollmentComplete() {

        if (mTotalSteps == -1 || mRemainingSteps == -1) {

            return false;

        } else if (mAccessibilityEnabled) {

            return false;

        }

        final int stepsEnrolled = mTotalSteps - mRemainingSteps;

        return stepsEnrolled >= NUM_CENTER_TOUCHES;
@@ -155,6 +163,10 @@ public class UdfpsEnrollHelper { 


    @NonNull

    PointF getNextGuidedEnrollmentPoint() {

        if (mAccessibilityEnabled) {

            return new PointF(0f, 0f);

        }



        float scale = SCALE;

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

            scale = Settings.Secure.getFloatForUser(mContext.getContentResolver(),