Merge "Moving HelpUtils to SettingsLib" into nyc-dev

[android-x86/packages-apps-Settings.git] / src / com / android / settings / fingerprint / FingerprintEnrollIntroduction.java

diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
index 7a805cb..d1bd3f7 100644 (file)
--- a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
@@ -16,30 +16,27 @@
 
 package com.android.settings.fingerprint;
 
-import android.app.Activity;
 import android.app.admin.DevicePolicyManager;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
-import android.hardware.fingerprint.FingerprintManager;
 import android.graphics.Typeface;
-import android.graphics.drawable.Drawable;
+import android.hardware.fingerprint.FingerprintManager;
 import android.os.Bundle;
 import android.os.UserHandle;
+import android.os.UserManager;
 import android.text.Annotation;
 import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
 import android.text.TextPaint;
-import android.text.method.LinkMovementMethod;
 import android.text.style.URLSpan;
 import android.util.Log;
 import android.view.View;
-import android.widget.AdapterView;
 
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.ChooseLockGeneric;
 import com.android.settings.ChooseLockSettingsHelper;
-import com.android.settings.HelpUtils;
+import com.android.settingslib.HelpUtils;
 import com.android.settings.R;
 import com.android.setupwizardlib.SetupWizardRecyclerLayout;
 import com.android.setupwizardlib.items.IItem;
@@ -56,6 +53,7 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase
     protected static final int FINGERPRINT_FIND_SENSOR_REQUEST = 2;
     protected static final int LEARN_MORE_REQUEST = 3;
 
+    private UserManager mUserManager;
     private boolean mHasPassword;
 
     @Override
@@ -65,6 +63,7 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase
         setHeaderText(R.string.security_settings_fingerprint_enroll_introduction_title);
         final SetupWizardRecyclerLayout layout =
                 (SetupWizardRecyclerLayout) findViewById(R.id.setup_wizard_layout);
+        mUserManager = UserManager.get(this);
         final RecyclerItemAdapter adapter = (RecyclerItemAdapter) layout.getAdapter();
         adapter.setOnItemSelectedListener(this);
         Item item = (Item) adapter.findItemById(R.id.fingerprint_introduction_message);
@@ -80,7 +79,7 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase
 
     private void updatePasswordQuality() {
         final int passwordQuality = new ChooseLockSettingsHelper(this).utils()
-                .getActivePasswordQuality(mUserId);
+                .getActivePasswordQuality(mUserManager.getCredentialOwnerProfile(mUserId));
         mHasPassword = passwordQuality != DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
     }