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

DO NOT MERGE: Change encryption preference's summary accordingly

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

415ce9a77d

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
This commit is contained in:
Alex Cruz
2017-10-20 19:26:58 -04:00
parent 60d6ffbc6c
commit f2fb449430
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

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

1
res/xml/security_settings_misc.xml
View File

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

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

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