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

RESTRICT AUTOMERGE Update UDFPS enroll progress when help received

Browse Source 
Fixes a bug where the completion animation is sometimes played near the
end of enrollment if ACQUIRED_GOOD is followed by a help message.

Test: Manual
Bug: 198989936
Bug: 199192982
Change-Id: I0fcf6d2cfbf33fb9b90d3ccf1fcbd7734a55edbd
Merged-In: Ifda20133f1ee90c9e1612e9066c19efbb6ffc9cd
Merged-In: Ic12b85bd6f8f1d4068952eb83bcc8a1df21f2e8e
This commit is contained in:
Curtis Belmonte
2021-09-07 14:44:12 -07:00
parent 2787813708
commit dc583a9024
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() {
Log.d(TAG, "onEnrollmentHelp");
if (mEnrollHelper != null) {
mEnrollHelper.onEnrollmentHelp();
}

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

@@ -56,6 +56,7 @@ public class UdfpsEnrollHelper {
interface Listener {
void onEnrollmentProgress(int remaining, int totalSteps);
void onEnrollmentHelp(int remaining, int totalSteps);
void onLastStepAcquired();
}
@@ -173,7 +174,9 @@ public class UdfpsEnrollHelper {
}
void onEnrollmentHelp() {
if (mListener != null) {
mListener.onEnrollmentHelp(mRemainingSteps, mTotalSteps);
}
}
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() {
mHandler.post(() -> {
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.Listener mEnrollHelperListener =
new UdfpsEnrollHelper.Listener() {
@Override
public void onEnrollmentProgress(int remaining, int totalSteps) {
mView.onEnrollmentProgress(remaining, totalSteps);
}
@Override
public void onEnrollmentProgress(int remaining, int totalSteps) {
mView.onEnrollmentProgress(remaining, totalSteps);
}
@Override
public void onLastStepAcquired() {
mView.onLastStepAcquired();
}
};
@Override
public void onEnrollmentHelp(int remaining, int totalSteps) {
mView.onEnrollmentHelp(remaining, totalSteps);
}
@Override
public void onLastStepAcquired() {
mView.onLastStepAcquired();
}
};
protected UdfpsEnrollViewController(
@NonNull UdfpsEnrollView view,