diff options
| author | Maurice Lam <yukl@google.com> | 2015-07-20 14:49:29 -0700 |
|---|---|---|
| committer | Maurice Lam <yukl@google.com> | 2015-07-20 21:52:12 +0000 |
| commit | c0e7879684d7d9c5cd102b124ee8cf1a2637d49d (patch) | |
| tree | fde67ad0368ba5470e0dba474ff8a9e57c080dbe /src/com/android/settings/EncryptionInterstitial.java | |
| parent | 4dd637a07e7eba9341d85c21fbb1fccac7e685c3 (diff) | |
| download | packages_apps_Settings-c0e7879684d7d9c5cd102b124ee8cf1a2637d49d.zip packages_apps_Settings-c0e7879684d7d9c5cd102b124ee8cf1a2637d49d.tar.gz packages_apps_Settings-c0e7879684d7d9c5cd102b124ee8cf1a2637d49d.tar.bz2 | |
[Fingerprint] Change message in encryption
Change the message for encryption interstitial when enrollin
fingerprint, to make it clear that fingerprint unlock is still used,
just that the backup unlock PIN / password / pattern will be needed
to start the device.
Bug: 22559146
Change-Id: Ia134e0d9b118151833a9118ff44667dcc9122185
Diffstat (limited to 'src/com/android/settings/EncryptionInterstitial.java')
| -rw-r--r-- | src/com/android/settings/EncryptionInterstitial.java | 14 |
1 files changed, 11 insertions, 3 deletions
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; |