commit ab5a3898f5b4b4f1a24101e12957788069a15e17
author Treehugger Robot <treehugger-gerrit@google.com> Tue Mar 06 18:55:54 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 06 18:55:54 2018 +0000
tree c7eb510547c58fbc29111e0d0d4252d46ae67111
parent 57f8e717c79751adb5fd27db69967a52ad1d6f15
parent f2fb4494309cc02ad16ca4324cf5196442212613

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

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index f037eb1..dab8e87 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -779,8 +779,10 @@
     <string name="encryption_and_credential_settings_title">Encryption &amp; credentials</string>
     <!-- Security Settings screen Encryption and crendential summary -->
     <string name="encryption_and_credential_settings_summary" product="default">Phone encrypted</string>
+    <string name="decryption_settings_summary" product="default">Phone not encrypted</string>
     <!-- Security Settings screen Encryption and crendential summary -->
     <string name="encryption_and_credential_settings_summary" product="tablet">Device encrypted</string>
+    <string name="decryption_settings_summary" product="tablet">Device not encrypted</string>
     <!-- Security Settings screen setting option title for the item to take you to the lock screen preference screen [CHAR LIMIT=60] -->
     <string name="lockscreen_settings_title">Lock screen preferences</string>
 

res/xml/security_settings_misc.xml

diff --git a/res/xml/security_settings_misc.xml b/res/xml/security_settings_misc.xml
index 7946dd9..ade4782 100644
--- a/res/xml/security_settings_misc.xml
+++ b/res/xml/security_settings_misc.xml
@@ -60,7 +60,6 @@
     <Preference
         android:key="encryption_and_credential"
         android:title="@string/encryption_and_credential_settings_title"
-        android:summary="@string/encryption_and_credential_settings_summary"
         android:fragment="com.android.settings.EncryptionAndCredential"/>
 
     <Preference android:key="manage_trust_agents"

src/com/android/settings/SecuritySettings.java

diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 55f21fd..23b149a 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -427,6 +427,17 @@
         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;
     }