From f6d341de9c5d0cff71544261d10c8375a9d67b7c Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Thu, 10 Nov 2016 00:26:37 +0000 Subject: Settings: Fix mismerge * This was wrongly added during merge of tag 'android-6.0.1_r74' Change-Id: I43f10016b69b4680da01be77ecb5fbb7e84a7429 --- .../settings/fingerprint/FingerprintEnrollIntroduction.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java index c3f2a5f..2e66d16 100644 --- a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java +++ b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java @@ -44,16 +44,9 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase { findViewById(R.id.cancel_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 View learnMoreButton = findViewById(R.id.learn_more_button); learnMoreButton.setOnClickListener(this); - if (Global.getInt(getContentResolver(), Global.DEVICE_PROVISIONED, 0) == 0) { + if (TextUtils.isEmpty(getString(R.string.help_url_fingerprint)) || + Global.getInt(getContentResolver(), Global.DEVICE_PROVISIONED, 0) == 0) { learnMoreButton.setVisibility(View.GONE); } -- cgit v1.1