From c9e29de3dc4015d1252bcf86ec586a8fc60e21e7 Mon Sep 17 00:00:00 2001 From: Adnan Begovic Date: Thu, 3 Mar 2016 11:32:50 -0800 Subject: Settings: Remove "Learn More" clickable text if not overlaid. If the "Learn More" textview's target click intent url is not overlaid, settings will throw an NPE. Remove the text if not overlaid. Change-Id: Ib80547a90b8c97485db2529b79172f7c461649c0 TICKET: CYNGNOS-2173 --- .../settings/fingerprint/FingerprintEnrollIntroduction.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src/com') diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java index beb1a8f..5753459 100644 --- a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java +++ b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java @@ -20,6 +20,7 @@ import android.app.admin.DevicePolicyManager; import android.content.Intent; import android.os.Bundle; import android.os.UserHandle; +import android.text.TextUtils; import android.view.View; import com.android.internal.logging.MetricsLogger; @@ -40,7 +41,15 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase { setContentView(R.layout.fingerprint_enroll_introduction); setHeaderText(R.string.security_settings_fingerprint_enroll_introduction_title); findViewById(R.id.cancel_button).setOnClickListener(this); - findViewById(R.id.learn_more_button).setOnClickListener(this); + + final View learnMoreButton = findViewById(R.id.learn_more_button); + // If help url is not overlaid, remove the button. + if (TextUtils.isEmpty(getString(R.string.help_url_fingerprint))) { + learnMoreButton.setVisibility(View.GONE); + } else { + learnMoreButton.setOnClickListener(this); + } + final int passwordQuality = new ChooseLockSettingsHelper(this).utils() .getActivePasswordQuality(UserHandle.myUserId()); mHasPassword = passwordQuality != DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED; -- cgit v1.1