Merge "Use FooterPreference in FingerprintSettings page" (656e4ef7) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java

+16 −3

Original line number	Diff line number	Diff line
		@@ -132,6 +132,7 @@ public class FingerprintSettings extends SubSettings {
		private boolean mLaunchedConfirm;
		private Drawable mHighlightDrawable;
		private int mUserId;
		private CharSequence mFooterTitle;

		private static final String TAG_AUTHENTICATE_SIDECAR = "authenticate_sidecar";
		private static final String TAG_REMOVAL_SIDECAR = "removal_sidecar";
		@@ -323,7 +324,6 @@ public class FingerprintSettings extends SubSettings {
		launchChooseOrConfirmLock();
		}

		final FooterPreference pref = mFooterPreferenceMixin.createFooterPreference();
		final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(
		activity, DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT, mUserId);
		final AnnotationSpan.LinkInfo adminLinkInfo = new AnnotationSpan.LinkInfo(
		@@ -334,11 +334,11 @@ public class FingerprintSettings extends SubSettings {
		activity, getString(getHelpResource()), activity.getClass().getName());
		final AnnotationSpan.LinkInfo linkInfo = new AnnotationSpan.LinkInfo(
		activity, ANNOTATION_URL, helpIntent);
		pref.setTitle(AnnotationSpan.linkify(getText(admin != null
		mFooterTitle = AnnotationSpan.linkify(getText(admin != null
		? R.string
		.security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled
		: R.string.security_settings_fingerprint_enroll_disclaimer),
		linkInfo, adminLinkInfo));
		linkInfo, adminLinkInfo);
		}

		protected void removeFingerprintPreference(int fingerprintId) {
		@@ -400,6 +400,7 @@ public class FingerprintSettings extends SubSettings {
		root.addPreference(addPreference);
		addPreference.setOnPreferenceChangeListener(this);
		updateAddPreference();
		createFooterPreference(root);
		}

		private void updateAddPreference() {
		@@ -419,6 +420,18 @@ public class FingerprintSettings extends SubSettings {
		addPreference.setEnabled(!tooMany && !removalInProgress);
		}

		private void createFooterPreference(PreferenceGroup root) {
		final Context context = getActivity();
		if (context == null) {
		return;
		}

		final FooterPreference footerPreference = new FooterPreference(context);
		footerPreference.setTitle(mFooterTitle);
		footerPreference.setSelectable(false);
		root.addPreference(footerPreference);
		}

		private static String genKey(int id) {
		return KEY_FINGERPRINT_ITEM_PREFIX + "_" + id;
		}