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

[Fingerprint] Change message in encryption

Browse Source 
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
This commit is contained in:
Maurice Lam
2015-07-20 14:49:29 -07:00
parent 4dd637a07e
commit c0e7879684
5 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;