Merge "Reflect device encryption status" into oc-mr1-dev

am: 3de3cf85f4 Change-Id: I0c64feb4eaa3b675cf0e6269279da04fe220f323
2017-09-23 00:32:05 +00:00
parent 078d01c8c1 3de3cf85f4
commit 7c94fcc9bc
1 changed files with 9 additions and 0 deletions
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -359,6 +359,15 @@ public class SecuritySettings extends SettingsPreferenceFragment
                    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
        mShowPassword = (SwitchPreference) root.findPreference(KEY_SHOW_PASSWORD);