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

Merge changes I5989a67e,I30a77bd6 into sc-dev

Browse Source 
* changes:
  Announce UDPFS enrollment percentage
  Update UDFPS fingerprint enrollment
This commit is contained in:
Kevin Chyn
2021-05-21 00:39:16 +00:00
committed by Android (Google) Code Review
parent c96c5c68d9 e25713054a
commit c24caeb4f8
4 changed files with 78 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/biometrics/BiometricEnrollBase.java
View File

@@ -170,20 +170,28 @@ public abstract class BiometricEnrollBase extends InstrumentedActivity {
layoutTitle.setAccessibilityLiveRegion(View.ACCESSIBILITY_LIVE_REGION_POLITE);
}
getLayout().setHeaderText(title);
getLayout().getHeaderTextView().setContentDescription(title);
setTitle(title);
}
}
protected void setHeaderText(int resId) {
setHeaderText(resId, false /* force */);
getLayout().getHeaderTextView().setContentDescription(getText(resId));
}
protected void setHeaderText(CharSequence title) {
getLayout().setHeaderText(title);
getLayout().getHeaderTextView().setContentDescription(title);
}
protected void setDescriptionText(int resId) {
getLayout().setDescriptionText(resId);
CharSequence previousDescription = getLayout().getDescriptionText();
CharSequence description = getString(resId);
// Prevent a11y for re-reading the same string
if (!TextUtils.equals(previousDescription, description)) {
getLayout().setDescriptionText(resId);
}
}
protected void setDescriptionText(CharSequence descriptionText) {