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

Hide fingerprint settings help if URL is empty

Browse Source 
Change-Id: I1631575bd6e48419f0649491a5ae167adf72c8c2
This commit is contained in:
Michael Bestas
2023-12-09 15:34:22 +02:00
committed by Michael Bestas
parent fd16ae4d80
commit 202c336281
1 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
View File

@@ -642,11 +642,18 @@ public class FingerprintSettings extends SubSettings {
private void updateFooterColumns(@NonNull Activity activity) { private void updateFooterColumns(@NonNull Activity activity) {
final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled( final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(
activity, DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT, mUserId); activity, DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT, mUserId);
final Intent helpIntent = HelpUtils.getHelpIntent( final Intent helpIntent;
final View.OnClickListener learnMoreClickListener;
if (getHelpResource() != 0) {
helpIntent = HelpUtils.getHelpIntent(
activity, getString(getHelpResource()), activity.getClass().getName()); activity, getString(getHelpResource()), activity.getClass().getName());
final View.OnClickListener learnMoreClickListener = (v) -> { learnMoreClickListener = (v) -> {
activity.startActivityForResult(helpIntent, 0); activity.startActivityForResult(helpIntent, 0);
}; };
} else {
helpIntent = null;
learnMoreClickListener = null;
}
mFooterColumns.clear(); mFooterColumns.clear();
if (admin != null) { if (admin != null) {
@@ -668,11 +675,13 @@ public class FingerprintSettings extends SubSettings {
column2.mTitle = getText( column2.mTitle = getText(
R.string.security_fingerprint_disclaimer_lockscreen_disabled_2 R.string.security_fingerprint_disclaimer_lockscreen_disabled_2
); );
if (helpIntent != null) {
if (!isUdfps() && isScreenOffUnlcokSupported()) { if (!isUdfps() && isScreenOffUnlcokSupported()) {
column2.mLearnMoreOverrideText = getText( column2.mLearnMoreOverrideText = getText(
R.string.security_settings_fingerprint_settings_footer_learn_more); R.string.security_settings_fingerprint_settings_footer_learn_more);
} }
column2.mLearnMoreClickListener = learnMoreClickListener; column2.mLearnMoreClickListener = learnMoreClickListener;
}
mFooterColumns.add(column2); mFooterColumns.add(column2);
} else { } else {
final FooterColumn column = new FooterColumn(); final FooterColumn column = new FooterColumn();
@@ -683,9 +692,11 @@ public class FingerprintSettings extends SubSettings {
? R.string.private_space_fingerprint_enroll_introduction_message ? R.string.private_space_fingerprint_enroll_introduction_message
: R.string.security_settings_fingerprint_enroll_introduction_v3_message, : R.string.security_settings_fingerprint_enroll_introduction_v3_message,
DeviceHelper.getDeviceName(getActivity())); DeviceHelper.getDeviceName(getActivity()));
if (helpIntent != null) {
column.mLearnMoreClickListener = learnMoreClickListener; column.mLearnMoreClickListener = learnMoreClickListener;
column.mLearnMoreOverrideText = getText( column.mLearnMoreOverrideText = getText(
featureProvider.getSettingPageFooterLearnMoreDescription()); featureProvider.getSettingPageFooterLearnMoreDescription());
}
mFooterColumns.add(column); mFooterColumns.add(column);
} }
} }