diff options
| author | Ido Ofir <iofir@google.com> | 2014-05-09 14:47:15 -0700 |
|---|---|---|
| committer | Ido Ofir <iofir@google.com> | 2014-05-28 13:36:11 -0700 |
| commit | 6f482447b05492906755d91ac4c29ec505a8a544 (patch) | |
| tree | 5d6ea907f8860b2960d08117494468eb18f30399 /res | |
| parent | 73f2110e0a31e252c76b3fa41d8014449a1da4b5 (diff) | |
| download | packages_apps_Settings-6f482447b05492906755d91ac4c29ec505a8a544.zip packages_apps_Settings-6f482447b05492906755d91ac4c29ec505a8a544.tar.gz packages_apps_Settings-6f482447b05492906755d91ac4c29ec505a8a544.tar.bz2 | |
Moving the trust agents settings in the security settings menu and adding
personal unlock.
Change-Id: I0eeb3a32c55450af2435112a98aa44475159dc4f
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/advanced_security_settings.xml (renamed from res/layout/trust_agent_settings.xml) | 0 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | res/xml/security_settings_misc.xml | 17 |
3 files changed, 12 insertions, 7 deletions
diff --git a/res/layout/trust_agent_settings.xml b/res/layout/advanced_security_settings.xml index 952d967..952d967 100644 --- a/res/layout/trust_agent_settings.xml +++ b/res/layout/advanced_security_settings.xml diff --git a/res/values/strings.xml b/res/values/strings.xml index 5e90be5..6bc1ff9 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -3979,6 +3979,8 @@ <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 group for advance security settings [CHAR LIMIT=30] --> + <string name="advanced_security_title">Advanced</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] --> diff --git a/res/xml/security_settings_misc.xml b/res/xml/security_settings_misc.xml index 84ce96c..c8f3e02 100644 --- a/res/xml/security_settings_misc.xml +++ b/res/xml/security_settings_misc.xml @@ -47,12 +47,6 @@ android:persistent="false" android:fragment="com.android.settings.DeviceAdminSettings"/> - <Preference android:key="manage_trust_agents" - android:title="@string/manage_trust_agents" - android:summary="@string/manage_trust_agents_summary" - android:persistent="false" - android:fragment="com.android.settings.TrustAgentSettings"/> - <CheckBoxPreference android:key="toggle_install_applications" android:title="@string/install_applications" android:summaryOff="@string/install_unknown_applications" @@ -64,7 +58,6 @@ android:summaryOff="@string/verify_applications_summary" android:summaryOn="@string/verify_applications_summary" android:persistent="false" /> - </PreferenceCategory> <PreferenceCategory android:key="credentials_management" @@ -99,4 +92,14 @@ android:targetClass="com.android.settings.CredentialStorage"/> </Preference> </PreferenceCategory> + + <PreferenceCategory android:key="advanced_security" + android:title="@string/advanced_security_title" + android:persistent="false"> + <Preference android:key="manage_trust_agents" + android:title="@string/manage_trust_agents" + android:summary="@string/manage_trust_agents_summary" + android:persistent="false" + android:fragment="com.android.settings.AdvancedSecuritySettings"/> + </PreferenceCategory> </PreferenceScreen> |