Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2fb4494 authored by Alex Cruz's avatar Alex Cruz
Browse files

DO NOT MERGE: Change encryption preference's summary accordingly 

With this change a summary to the encryption preference was added.

https://android.googlesource.com/platform/packages/apps/Settings/+/415ce9a77d44732966fbab641d1ecaa8e8688381

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
parent 60d6ffbc

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -748,8 +748,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



+0
−1






























Original line number
Diff line number
Diff line







@@ -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



+11
−0






























Original line number
Diff line number
Diff line







@@ -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;









    }