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

Merge "[ScreenLock] Use requested quality for encryption popup" into nyc-dev

Browse Source 
am: 102b368172

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

Change-Id: I9373cd533e57006e71e9ea7df064f203994c7217
This commit is contained in:
Maurice Lam
2016-05-13 00:59:26 +00:00
committed by android-build-merger
parent 1d1ca8e590 102b368172
commit 1bc12ee9c2
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/EncryptionInterstitial.java
View File

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