DO NOT MERGE: Change encryption preference's summary accordingly
With this change a summary to the encryption preference was added.
415ce9a77d
The problem is that even if you're not encrypted, it says that your phone is.
Is very misleading to the user that don't bother to enter the actual preference
and want to see if they are. This fixes that.
Test: Go into Settings/Security & Location
Change-Id: Iaeaffd340f2e248748f244a947aa71eb8ad4ab94
This commit is contained in:
@@ -408,6 +408,17 @@ public class SecuritySettings extends SettingsPreferenceFragment
|
||||
mEnterprisePrivacyPreferenceController.displayPreference(root);
|
||||
mEnterprisePrivacyPreferenceController.onResume();
|
||||
|
||||
final Preference encryptioncredential = root.findPreference(KEY_ENCRYPTION_AND_CREDENTIALS);
|
||||
if (LockPatternUtils.isDeviceEncryptionEnabled()) {
|
||||
final String summaryencrypt = getContext().getString(
|
||||
R.string.encryption_and_credential_settings_summary);
|
||||
encryptioncredential.setSummary(summaryencrypt);
|
||||
} else {
|
||||
final String summarydecrypt = getContext().getString(
|
||||
R.string.decryption_settings_summary);
|
||||
encryptioncredential.setSummary(summarydecrypt);
|
||||
}
|
||||
|
||||
return root;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user