diff options
| author | Kenny Root <kroot@google.com> | 2013-03-29 14:36:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-29 14:36:30 -0700 |
| commit | 265398ecb3fbacd1c93f097dbb11512770edb788 (patch) | |
| tree | d7203b7a2cd424acc0d31e98d9b21245aadcbb3f /res | |
| parent | a8a4373a0998ad302f8103210f00342999deaabf (diff) | |
| parent | ab6a6645b01312816fe0688c76b5a26948252850 (diff) | |
| download | packages_apps_Settings-265398ecb3fbacd1c93f097dbb11512770edb788.zip packages_apps_Settings-265398ecb3fbacd1c93f097dbb11512770edb788.tar.gz packages_apps_Settings-265398ecb3fbacd1c93f097dbb11512770edb788.tar.bz2 | |
am ab6a6645: Merge "Add KeyStore storage type to Settings UI" into jb-mr2-dev
* commit 'ab6a6645b01312816fe0688c76b5a26948252850':
Add KeyStore storage type to Settings UI
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 6 | ||||
| -rw-r--r-- | res/xml/security_settings_misc.xml | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 7a427a5..3a18b3a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -3529,6 +3529,12 @@ <string name="trusted_credentials">Trusted credentials</string> <!-- Summary of preference to display trusted credentials (aka CA certificates) [CHAR LIMIT=NONE] --> <string name="trusted_credentials_summary">Display trusted CA certificates</string> + <!-- Title of preference of what type of credential storage this device has: hardware or software [CHAR LIMIT=30] --> + <string name="credential_storage_type">Storage type</string> + <!-- Summary text for preference showing what type of credential storage this device has when it is stored in a hardware-backed storage (as opposed to "software only") [CHAR LIMIT=NONE] --> + <string name="credential_storage_type_hardware">Hardware-backed</string> + <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] --> + <string name="credential_storage_type_software">Software only</string> <!-- Message to draw an unlock pattern when installing credentials --> <string name="credentials_install_gesture_prompt">Draw your unlock pattern</string> diff --git a/res/xml/security_settings_misc.xml b/res/xml/security_settings_misc.xml index ee87e51..10fc98f 100644 --- a/res/xml/security_settings_misc.xml +++ b/res/xml/security_settings_misc.xml @@ -63,6 +63,11 @@ <PreferenceCategory android:key="credentials_management" android:title="@string/credentials_title" android:persistent="false"> + <Preference android:key="credential_storage_type" + android:title="@string/credential_storage_type" + style="?android:attr/preferenceInformationStyle" + android:persistent="false" /> + <Preference android:title="@string/trusted_credentials" android:summary="@string/trusted_credentials_summary" android:persistent="false" |