am dfe3368b: am 649215a5: am e63322f6: resolved conflicts for merge of f90628c6 to mnc-dr-dev

* commit 'dfe3368bf67e5bee41fe92a9cca0879007199bcb':
  [Fingerprint] Export FingerprintEnrollIntroduction
This commit is contained in:
Maurice Lam
2015-07-15 22:55:47 +00:00
committed by Android Git Automerger

View File

@@ -40,7 +40,7 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase {
setHeaderText(R.string.security_settings_fingerprint_enroll_introduction_title);
findViewById(R.id.cancel_button).setOnClickListener(this);
findViewById(R.id.learn_more_button).setOnClickListener(this);
final double passwordQuality = new ChooseLockSettingsHelper(this).utils()
final int passwordQuality = new ChooseLockSettingsHelper(this).utils()
.getActivePasswordQuality(UserHandle.myUserId());
mHasPassword = passwordQuality != DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
}