summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorDaniel Micay <danielmicay@gmail.com>2015-06-27 12:39:17 -0400
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2016-12-16 20:00:29 +0100
commit1c224e1186090db1a617eafe4c492992a869b427 (patch)
treeb1e19b0719e185f298223aad0c6de1bd3a4d8174 /res
parentda369854affb579124f6f258e1cb7068b3ee7892 (diff)
downloadpackages_apps_Settings-1c224e1186090db1a617eafe4c492992a869b427.zip
packages_apps_Settings-1c224e1186090db1a617eafe4c492992a869b427.tar.gz
packages_apps_Settings-1c224e1186090db1a617eafe4c492992a869b427.tar.bz2
support replacing a separate encryption password
Diffstat (limited to 'res')
-rw-r--r--res/values/strings.xml6
-rw-r--r--res/xml/security_settings_encrypted.xml12
2 files changed, 17 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 68e1456..e5efde6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -946,6 +946,12 @@
<!-- Header on first screen of choose encryption password [CHAR LIMIT=30] -->
<string name="crypt_keeper_choose_your_password_header">Set encryption password</string>
+ <!-- Title for PreferenceScreen to replace encryption password [CHAR LIMIT=22] -->
+ <string name="crypt_keeper_replace_password_title">Replace encryption password</string>
+
+ <!-- Summary for PreferenceScreen to replace encryption password [CHAR LIMIT=45] -->
+ <string name="crypt_keeper_replace_password_summary">Remove the separate encryption password</string>
+
<!-- Unlock Picker Settings --><skip />
<!-- Security Picker --><skip />
diff --git a/res/xml/security_settings_encrypted.xml b/res/xml/security_settings_encrypted.xml
index f05bad5..4a54788 100644
--- a/res/xml/security_settings_encrypted.xml
+++ b/res/xml/security_settings_encrypted.xml
@@ -18,7 +18,7 @@
android:title="@string/security_settings_title">
<PreferenceCategory
- android:key="security_category"
+ android:key="encryption_category"
android:title="@string/crypt_keeper_settings_title">
<Preference
@@ -37,6 +37,16 @@
android:targetClass="com.android.settings.ChooseEncryptionPassword" />
</Preference>
+ <Preference
+ android:key="crypt_keeper_replace_password"
+ android:title="@string/crypt_keeper_replace_password_title"
+ android:summary="@string/crypt_keeper_replace_password_summary">
+
+ <intent android:action="android.intent.action.MAIN"
+ android:targetPackage="com.android.settings"
+ android:targetClass="com.android.settings.ReplaceEncryptionPassword" />
+ </Preference>
+
</PreferenceCategory>