Merge tag 'android-6.0.1_r74' into HEAD

CYNGNOS-3303

Android 6.0.1 release 74

Change-Id: Id902564eaffb5084650acbee5f9b853fba21cc86

diff --cc src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
index 5753459,bc2757a..c3f2a5f
--- 1/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
--- 2/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
@@@ -20,7 -20,7 +20,8 @@@ import android.app.admin.DevicePolicyMa
  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;
@@@ -41,15 -41,11 +42,21 @@@ public class FingerprintEnrollIntroduct
          setContentView(R.layout.fingerprint_enroll_introduction);
          setHeaderText(R.string.security_settings_fingerprint_enroll_introduction_title);
          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) {
+             learnMoreButton.setVisibility(View.GONE);
+         }
++
          final int passwordQuality = new ChooseLockSettingsHelper(this).utils()
                  .getActivePasswordQuality(UserHandle.myUserId());
          mHasPassword = passwordQuality != DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;