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

Merge "DO NOT MERGE: Change encryption preference's summary accordingly"

Browse Source
This commit is contained in:
Treehugger Robot
2018-03-06 18:55:54 +00:00
committed by Gerrit Code Review
parent 57f8e717c7 f2fb449430
commit ab5a3898f5
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/SecuritySettings.java
View File

@@ -427,6 +427,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;
}