diff options
| author | Bruno Martins <bgcngm@gmail.com> | 2016-11-10 00:26:37 +0000 |
|---|---|---|
| committer | Dan Pasanen <invisiblek@cyanogenmod.org> | 2016-11-09 19:20:43 -0700 |
| commit | f6d341de9c5d0cff71544261d10c8375a9d67b7c (patch) | |
| tree | 4cc273dfacb835c84ed2c2745d8ba598f86be7eb | |
| parent | 9f5f2fb943fa14aa775291a373fa67b1ae4a2a60 (diff) | |
| download | packages_apps_Settings-f6d341de9c5d0cff71544261d10c8375a9d67b7c.zip packages_apps_Settings-f6d341de9c5d0cff71544261d10c8375a9d67b7c.tar.gz packages_apps_Settings-f6d341de9c5d0cff71544261d10c8375a9d67b7c.tar.bz2 | |
Settings: Fix mismerge
* This was wrongly added during merge of tag 'android-6.0.1_r74'
Change-Id: I43f10016b69b4680da01be77ecb5fbb7e84a7429
| -rw-r--r-- | src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java | 11 |
1 files 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); } |