PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'e63322f640cf955ba296e064b07e4920d334f851':
  [Fingerprint] Export FingerprintEnrollIntroduction
This commit is contained in:
Maurice Lam
2015-07-15 22:32:43 +00:00
committed by Android Git Automerger
parent eb37daffa1 e63322f640
commit 649215a50c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
View File

@@ -40,7 +40,7 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase {
setHeaderText(R.string.security_settings_fingerprint_enroll_introduction_title); setHeaderText(R.string.security_settings_fingerprint_enroll_introduction_title);
findViewById(R.id.cancel_button).setOnClickListener(this); findViewById(R.id.cancel_button).setOnClickListener(this);
findViewById(R.id.learn_more_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()); .getActivePasswordQuality(UserHandle.myUserId());
mHasPassword = passwordQuality != DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED; mHasPassword = passwordQuality != DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
} }