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

Merge "RESTRICT AUTOMERGE Update UDFPS enroll progress when help received" into sc-dev

Browse Source
This commit is contained in:
Curtis Belmonte
2021-09-08 06:47:56 +00:00
committed by Android (Google) Code Review
parent 9d0955d75f dc583a9024
commit a955df6ebc
4 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java
View File

@@ -217,6 +217,7 @@ public class UdfpsController implements DozeReceiver {
} }
void onEnrollmentHelp() { void onEnrollmentHelp() {
Log.d(TAG, "onEnrollmentHelp");
if (mEnrollHelper != null) { if (mEnrollHelper != null) {
mEnrollHelper.onEnrollmentHelp(); mEnrollHelper.onEnrollmentHelp();
} }

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

@@ -56,6 +56,7 @@ public class UdfpsEnrollHelper {
interface Listener { interface Listener {
void onEnrollmentProgress(int remaining, int totalSteps); void onEnrollmentProgress(int remaining, int totalSteps);
void onEnrollmentHelp(int remaining, int totalSteps);
void onLastStepAcquired(); void onLastStepAcquired();
} }
@@ -173,7 +174,9 @@ public class UdfpsEnrollHelper {
} }
void onEnrollmentHelp() { void onEnrollmentHelp() {
if (mListener != null) {
mListener.onEnrollmentHelp(mRemainingSteps, mTotalSteps);
}
} }
void setListener(Listener listener) { void setListener(Listener listener) {

5
packages/SystemUI/src/com/android/systemui/biometrics/UdfpsEnrollView.java
View File

@@ -83,6 +83,11 @@ public class UdfpsEnrollView extends UdfpsAnimationView {
}); });
} }
void onEnrollmentHelp(int remaining, int totalSteps) {
mHandler.post(
() -> mFingerprintProgressDrawable.setEnrollmentProgress(remaining, totalSteps));
}
void onLastStepAcquired() { void onLastStepAcquired() {
mHandler.post(() -> { mHandler.post(() -> {
mFingerprintProgressDrawable.onLastStepAcquired(); mFingerprintProgressDrawable.onLastStepAcquired();

23
packages/SystemUI/src/com/android/systemui/biometrics/UdfpsEnrollViewController.java
View File

@@ -33,16 +33,21 @@ public class UdfpsEnrollViewController extends UdfpsAnimationViewController<Udfp
@NonNull private final UdfpsEnrollHelper mEnrollHelper; @NonNull private final UdfpsEnrollHelper mEnrollHelper;
@NonNull private final UdfpsEnrollHelper.Listener mEnrollHelperListener = @NonNull private final UdfpsEnrollHelper.Listener mEnrollHelperListener =
new UdfpsEnrollHelper.Listener() { new UdfpsEnrollHelper.Listener() {
@Override @Override
public void onEnrollmentProgress(int remaining, int totalSteps) { public void onEnrollmentProgress(int remaining, int totalSteps) {
mView.onEnrollmentProgress(remaining, totalSteps); mView.onEnrollmentProgress(remaining, totalSteps);
} }
@Override @Override
public void onLastStepAcquired() { public void onEnrollmentHelp(int remaining, int totalSteps) {
mView.onLastStepAcquired(); mView.onEnrollmentHelp(remaining, totalSteps);
} }
};
@Override
public void onLastStepAcquired() {
mView.onLastStepAcquired();
}
};
protected UdfpsEnrollViewController( protected UdfpsEnrollViewController(
@NonNull UdfpsEnrollView view, @NonNull UdfpsEnrollView view,