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

Merge "Update strings for Watch Unlock" into main

Browse Source
This commit is contained in:
Derek Jedral
2023-11-30 05:23:33 +00:00
committed by Android (Google) Code Review
parent 50ffdb4a9e 2c4f5454f1
commit db72f4ea5f
3 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/biometrics/activeunlock/ActiveUnlockStatusUtils.java
View File

@@ -191,13 +191,10 @@ public class ActiveUnlockStatusUtils {
public String getIntroForActiveUnlock() {
final boolean faceAllowed = Utils.hasFaceHardware(mContext);
final boolean fingerprintAllowed = Utils.hasFingerprintHardware(mContext);
if (useBiometricFailureLayout()) {
if (isAvailable()) {
int introRes = getIntroRes(faceAllowed, fingerprintAllowed);
return introRes == 0 ? "" : mContext.getString(introRes);
}
if (useUnlockIntentLayout() && (!faceAllowed || !fingerprintAllowed)) {
return "";
}
return mContext.getString(R.string.biometric_settings_intro);
}