diff options
author | Maurice Lam <yukl@google.com> | 2016-09-01 17:10:59 -0700 |
---|---|---|
committer | gitbuildkicker <android-build@google.com> | 2016-09-26 23:22:44 -0700 |
commit | 566da28d087bb560b9a676a48ee080e703f1afbf (patch) | |
tree | a9f8b5afb91e11f6ac55688ba3113712cbefc103 | |
parent | 82a34268e6100ee1f3dde218be49d8b38d247b91 (diff) | |
download | packages_apps_Settings-566da28d087bb560b9a676a48ee080e703f1afbf.tar.gz packages_apps_Settings-566da28d087bb560b9a676a48ee080e703f1afbf.tar.bz2 packages_apps_Settings-566da28d087bb560b9a676a48ee080e703f1afbf.zip |
Remove help links when device is not provisioned. DO NOT MERGEandroid-7.0.0_r15
Bug: 31246856
Change-Id: Id638de8ab1c6b815d62916a584892be84cabe1ae
(cherry picked from commit d0a95da564df4c52ed7475af0d1833e95b0d746b)
-rw-r--r-- | src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java index 5b9d39876e..1719289cc1 100644 --- a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java +++ b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java @@ -25,6 +25,7 @@ import android.hardware.fingerprint.FingerprintManager; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; +import android.provider.Settings.Global; import android.text.Annotation; import android.text.SpannableString; import android.text.SpannableStringBuilder; @@ -69,9 +70,15 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase final RecyclerItemAdapter adapter = (RecyclerItemAdapter) layout.getAdapter(); adapter.setOnItemSelectedListener(this); Item item = (Item) adapter.findItemById(R.id.fingerprint_introduction_message); + String linkUrl = getString(R.string.help_url_fingerprint); + if (Global.getInt(getContentResolver(), Global.DEVICE_PROVISIONED, 0) == 0) { + // If the device is not provisioned, help intents from HelpUtils will be null, so don't + // show the link at all. + linkUrl = ""; + } item.setTitle(LearnMoreSpan.linkify( getText(R.string.security_settings_fingerprint_enroll_introduction_message), - getString(R.string.help_url_fingerprint))); + linkUrl)); // setupwizard library automatically sets the divider inset to // R.dimen.suw_items_icon_divider_inset. We adjust this back to 0 as we do not want // an inset within settings. |