PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update SFPS Enrollment to have error messages replace title" into tm-qpr-dev am: e287bbe82b

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

Change-Id: Ie4c31048df6afc3dcb115abebdabe100ffd12fc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Grace Cheng
2022-07-13 17:26:17 +00:00
committed by Automerger Merge Worker
parent b59e099ce6 e287bbe82b
commit b04079323c
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
View File

@@ -115,6 +115,7 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
private FingerprintManager mFingerprintManager;
private boolean mCanAssumeUdfps;
private boolean mCanAssumeSidefps;
@Nullable private ProgressBar mProgressBar;
private ObjectAnimator mProgressAnim;
private TextView mDescriptionText;
@@ -156,7 +157,8 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
mFingerprintManager = getSystemService(FingerprintManager.class);
final List<FingerprintSensorPropertiesInternal> props =
mFingerprintManager.getSensorPropertiesInternal();
mCanAssumeUdfps = props.size() == 1 && props.get(0).isAnyUdfpsType();
mCanAssumeUdfps = props != null && props.size() == 1 && props.get(0).isAnyUdfpsType();
mCanAssumeSidefps = props != null && props.size() == 1 && props.get(0).isAnySidefpsType();
mAccessibilityManager = getSystemService(AccessibilityManager.class);
mIsAccessibilityEnabled = mAccessibilityManager.isEnabled();
@@ -567,7 +569,7 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
}
private void showError(CharSequence error) {
if (mCanAssumeUdfps) {
if (mCanAssumeUdfps || mCanAssumeSidefps) {
setHeaderText(error);
// Show nothing for subtitle when getting an error message.
setDescriptionText("");