Merge "Add pace for UdfpsEnrollHelper" into udc-qpr-dev am: c9606ad732 am: 8155c507f2

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24755290

Change-Id: I7485782ee1b939e12f2c4f87fd1a8405227dd182
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Anthony Zhang
2023-10-20 21:21:23 +00:00
committed by Automerger Merge Worker

View File

@@ -76,6 +76,8 @@ public class UdfpsEnrollHelper extends InstrumentedFragment {
private int mCenterTouchCount = 0; private int mCenterTouchCount = 0;
private int mPace = 1;
@Nullable @Nullable
UdfpsEnrollHelper.Listener mListener; UdfpsEnrollHelper.Listener mListener;
@@ -157,6 +159,9 @@ public class UdfpsEnrollHelper extends InstrumentedFragment {
} }
} }
if (mRemainingSteps > remaining) {
mPace = mRemainingSteps - remaining;
}
mRemainingSteps = remaining; mRemainingSteps = remaining;
if (mListener != null && mTotalSteps != -1) { if (mListener != null && mTotalSteps != -1) {
@@ -258,7 +263,7 @@ public class UdfpsEnrollHelper extends InstrumentedFragment {
return false; return false;
} }
return mRemainingSteps <= 2 && mRemainingSteps >= 0; return mRemainingSteps <= mPace && mRemainingSteps >= 0;
} }
private int getStageThresholdSteps(int totalSteps, int stageIndex) { private int getStageThresholdSteps(int totalSteps, int stageIndex) {