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

Merge "Reflect device encryption status" into oc-mr1-dev am: 3de3cf85f4

Browse Source 
am: 7c94fcc9bc

Change-Id: I44690e80e84d9de842d04bb349581cbfb2a3c808
This commit is contained in:
Ng Zhi An
2017-09-23 00:34:05 +00:00
committed by android-build-merger
parent 8d4aa3f9b3 7c94fcc9bc
commit 15b71d0305
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -359,6 +359,15 @@ public class SecuritySettings extends SettingsPreferenceFragment
getResources().getString(R.string.switch_on_text)); getResources().getString(R.string.switch_on_text));
} }
// Encryption status of device
if (LockPatternUtils.isDeviceEncryptionEnabled()) {
root.findPreference(KEY_ENCRYPTION_AND_CREDENTIALS).setSummary(
R.string.encryption_and_credential_settings_summary);
} else {
root.findPreference(KEY_ENCRYPTION_AND_CREDENTIALS).setSummary(
R.string.summary_placeholder);
}
// Show password // Show password
mShowPassword = (SwitchPreference) root.findPreference(KEY_SHOW_PASSWORD); mShowPassword = (SwitchPreference) root.findPreference(KEY_SHOW_PASSWORD);