Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit d1a1a2a3 authored by Maurice Lam's avatar Maurice Lam Committed by Adrian DC
Browse files

[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE 

Remove the learn more link during setup wizard, because HelpUtils is
returning null for the intent while the device is not provisioned.

Bug: 31246856
Change-Id: I4cf5c282f170188aef98a02d3b96af5e63ea7f39
(cherry picked from commit c94f2b93)

Settings: Fix mismerge

 * This was wrongly added during merge of tag 'android-6.0.1_r74'

RM-290

Change-Id: I43f10016b69b4680da01be77ecb5fbb7e84a7429
parent 35c6c611

src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java

+7 −5
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.content.Intent; 
import android.os.Bundle;

import android.os.UserHandle;

import android.text.TextUtils;

import android.provider.Settings.Global;

import android.view.View;



import com.android.internal.logging.MetricsLogger;
@@ -43,11 +44,10 @@ 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);

        if (TextUtils.isEmpty(getString(R.string.help_url_fingerprint)) ||

                Global.getInt(getContentResolver(), Global.DEVICE_PROVISIONED, 0) == 0) {

            learnMoreButton.setVisibility(View.GONE);

        }



        final int passwordQuality = new ChooseLockSettingsHelper(this).utils()
@@ -100,8 +100,10 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase { 
    private void launchFingerprintHelp() {

        Intent helpIntent = HelpUtils.getHelpIntent(this,

                getString(R.string.help_url_fingerprint), getClass().getName());

        if (helpIntent != null) {

            startActivity(helpIntent);

        }

    }



    @Override

    protected int getMetricsCategory() {