commit 1bc12ee9c25ea42c660d11244b8ff9a0c03ba3c0
author Maurice Lam <yukl@google.com> Fri May 13 00:59:26 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri May 13 00:59:26 2016 +0000
tree c06ac1c657a601211d699dc667ad493e11cc5e11
parent 1d1ca8e5905c100efde0ffdfcc8b1dcc7dbc32c8
parent 102b368172b4e8201b32efb686b3f3334e5ddbda

Merge "[ScreenLock] Use requested quality for encryption popup" into nyc-dev
am: 102b368172

* commit '102b368172b4e8201b32efb686b3f3334e5ddbda':
  [ScreenLock] Use requested quality for encryption popup

Change-Id: I9373cd533e57006e71e9ea7df064f203994c7217

src/com/android/settings/EncryptionInterstitial.java

diff --git a/src/com/android/settings/EncryptionInterstitial.java b/src/com/android/settings/EncryptionInterstitial.java
index 89eba7c..e9e2a7c 100644
--- a/src/com/android/settings/EncryptionInterstitial.java
+++ b/src/com/android/settings/EncryptionInterstitial.java
@@ -24,16 +24,13 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.os.UserHandle;
 import android.support.v7.preference.Preference;
 import android.util.Log;
 import android.view.LayoutInflater;
-import android.view.View;
 import android.view.accessibility.AccessibilityManager;
 import android.widget.TextView;
 
 import com.android.internal.logging.MetricsProto.MetricsEvent;
-import com.android.internal.widget.LockPatternUtils;
 
 import java.util.List;
 
@@ -78,6 +75,7 @@
         private Preference mDontRequirePasswordToDecrypt;
         private boolean mPasswordRequired;
         private Intent mUnlockMethodIntent;
+        private int mRequestedPasswordQuality;
 
         @Override
         protected int getMetricsCategory() {
@@ -99,12 +97,12 @@
             boolean forFingerprint = getActivity().getIntent().getBooleanExtra(
                     ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, false);
             Intent intent = getActivity().getIntent();
-            final int quality = intent.getIntExtra(EXTRA_PASSWORD_QUALITY, 0);
-            mUnlockMethodIntent = (Intent) intent.getParcelableExtra(EXTRA_UNLOCK_METHOD_INTENT);
+            mRequestedPasswordQuality = intent.getIntExtra(EXTRA_PASSWORD_QUALITY, 0);
+            mUnlockMethodIntent = intent.getParcelableExtra(EXTRA_UNLOCK_METHOD_INTENT);
             final int msgId;
             final int enableId;
             final int disableId;
-            switch (quality) {
+            switch (mRequestedPasswordQuality) {
                 case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING:
                     msgId = forFingerprint ?
                             R.string.encryption_interstitial_message_pattern_for_fingerprint :
@@ -188,11 +186,9 @@
         public Dialog onCreateDialog(int dialogId) {
             switch(dialogId) {
                 case ACCESSIBILITY_WARNING_DIALOG: {
-                    final int quality = new LockPatternUtils(getActivity())
-                            .getKeyguardStoredPasswordQuality(UserHandle.myUserId());
                     final int titleId;
                     final int messageId;
-                    switch (quality) {
+                    switch (mRequestedPasswordQuality) {
                         case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING:
                             titleId = R.string.encrypt_talkback_dialog_require_pattern;
                             messageId = R.string.encrypt_talkback_dialog_message_pattern;