diff options
| author | Maurice Lam <yukl@google.com> | 2015-07-21 00:22:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-21 00:25:16 +0000 |
| commit | d10026cbfde671448b702fde345da52ac7569d04 (patch) | |
| tree | db4004b8387442acea3dfc9232be3333a5209734 /src | |
| parent | af57ec8831d3047400a6bcbc8c5e73fc3888b7d3 (diff) | |
| parent | c0e7879684d7d9c5cd102b124ee8cf1a2637d49d (diff) | |
| download | packages_apps_Settings-d10026cbfde671448b702fde345da52ac7569d04.zip packages_apps_Settings-d10026cbfde671448b702fde345da52ac7569d04.tar.gz packages_apps_Settings-d10026cbfde671448b702fde345da52ac7569d04.tar.bz2 | |
Merge "[Fingerprint] Change message in encryption" into mnc-dev
Diffstat (limited to 'src')
4 files changed, 18 insertions, 3 deletions
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java index 317d372..27e8c93 100644 --- a/src/com/android/settings/ChooseLockGeneric.java +++ b/src/com/android/settings/ChooseLockGeneric.java @@ -97,6 +97,7 @@ public class ChooseLockGeneric extends SettingsActivity { private int mEncryptionRequestQuality; private boolean mEncryptionRequestDisabled; private boolean mRequirePassword; + private boolean mForFingerprint = false; private String mUserPassword; private LockPatternUtils mLockPatternUtils; private FingerprintManager mFingerprintManager; @@ -140,6 +141,8 @@ public class ChooseLockGeneric extends SettingsActivity { ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false); mChallenge = getActivity().getIntent().getLongExtra( ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0); + mForFingerprint = getActivity().getIntent().getBooleanExtra( + ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, false); if (savedInstanceState != null) { mPasswordConfirmed = savedInstanceState.getBoolean(PASSWORD_CONFIRMED); @@ -201,6 +204,8 @@ public class ChooseLockGeneric extends SettingsActivity { final boolean accEn = AccessibilityManager.getInstance(context).isEnabled(); final boolean required = mLockPatternUtils.isCredentialRequiredToDecrypt(!accEn); Intent intent = getEncryptionInterstitialIntent(context, quality, required); + intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, + mForFingerprint); startActivityForResult(intent, ENABLE_ENCRYPTION_REQUEST); } else { mRequirePassword = false; // device encryption not enabled or not device owner. diff --git a/src/com/android/settings/ChooseLockSettingsHelper.java b/src/com/android/settings/ChooseLockSettingsHelper.java index 8b8d976..c07186f 100644 --- a/src/com/android/settings/ChooseLockSettingsHelper.java +++ b/src/com/android/settings/ChooseLockSettingsHelper.java @@ -32,6 +32,7 @@ public final class ChooseLockSettingsHelper { public static final String EXTRA_KEY_HAS_CHALLENGE = "has_challenge"; public static final String EXTRA_KEY_CHALLENGE = "challenge"; public static final String EXTRA_KEY_CHALLENGE_TOKEN = "hw_auth_token"; + public static final String EXTRA_KEY_FOR_FINGERPRINT = "for_fingerprint"; private LockPatternUtils mLockPatternUtils; diff --git a/src/com/android/settings/EncryptionInterstitial.java b/src/com/android/settings/EncryptionInterstitial.java index 794005b..73d8257 100644 --- a/src/com/android/settings/EncryptionInterstitial.java +++ b/src/com/android/settings/EncryptionInterstitial.java @@ -95,24 +95,32 @@ public class EncryptionInterstitial extends SettingsActivity { (RadioButton) view.findViewById(R.id.encrypt_dont_require_password); mEncryptionMessage = (TextView) view.findViewById(R.id.encryption_message); + boolean forFingerprint = getActivity().getIntent().getBooleanExtra( + ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, false); int quality = getActivity().getIntent().getIntExtra(EXTRA_PASSWORD_QUALITY, 0); final int msgId; final int enableId; final int disableId; switch (quality) { case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING: - msgId = R.string.encryption_interstitial_message_pattern; + msgId = forFingerprint ? + R.string.encryption_interstitial_message_pattern_for_fingerprint : + R.string.encryption_interstitial_message_pattern; enableId = R.string.encrypt_require_pattern; disableId = R.string.encrypt_dont_require_pattern; break; case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC: case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX: - msgId = R.string.encryption_interstitial_message_pin; + msgId = forFingerprint ? + R.string.encryption_interstitial_message_pin_for_fingerprint : + R.string.encryption_interstitial_message_pin; enableId = R.string.encrypt_require_pin; disableId = R.string.encrypt_dont_require_pin; break; default: - msgId = R.string.encryption_interstitial_message_password; + msgId = forFingerprint ? + R.string.encryption_interstitial_message_password_for_fingerprint : + R.string.encryption_interstitial_message_password; enableId = R.string.encrypt_require_password; disableId = R.string.encrypt_dont_require_password; break; diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollOnboard.java b/src/com/android/settings/fingerprint/FingerprintEnrollOnboard.java index db1a20b..e81b0ff 100644 --- a/src/com/android/settings/fingerprint/FingerprintEnrollOnboard.java +++ b/src/com/android/settings/fingerprint/FingerprintEnrollOnboard.java @@ -64,6 +64,7 @@ public class FingerprintEnrollOnboard extends FingerprintEnrollBase { intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.HIDE_DISABLED_PREFS, true); intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true); intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge); + intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, true); startActivityForResult(intent, CHOOSE_LOCK_GENERIC_REQUEST); } |