diff options
Diffstat (limited to 'res')
-rw-r--r-- | res/xml/security_settings_biometric_weak.xml | 2 | ||||
-rw-r--r-- | res/xml/security_settings_chooser.xml | 2 | ||||
-rw-r--r-- | res/xml/security_settings_encrypted.xml | 8 | ||||
-rw-r--r-- | res/xml/security_settings_lockscreen.xml | 2 | ||||
-rw-r--r-- | res/xml/security_settings_misc.xml | 20 | ||||
-rw-r--r-- | res/xml/security_settings_nfc_unlock.xml | 33 | ||||
-rw-r--r-- | res/xml/security_settings_password.xml | 2 | ||||
-rw-r--r-- | res/xml/security_settings_pin.xml | 2 |
8 files changed, 37 insertions, 34 deletions
diff --git a/res/xml/security_settings_biometric_weak.xml b/res/xml/security_settings_biometric_weak.xml index c2e8ab7..98916a1 100644 --- a/res/xml/security_settings_biometric_weak.xml +++ b/res/xml/security_settings_biometric_weak.xml @@ -56,8 +56,8 @@ android:title="@string/security_enable_widgets_title"/> <PreferenceScreen - android:fragment="com.android.settings.OwnerInfoSettings" android:key="owner_info_settings" + android:fragment="com.android.settings.OwnerInfoSettings" android:title="@string/owner_info_settings_title" android:summary="@string/owner_info_settings_summary"/> diff --git a/res/xml/security_settings_chooser.xml b/res/xml/security_settings_chooser.xml index 1a54315..3d2ceab 100644 --- a/res/xml/security_settings_chooser.xml +++ b/res/xml/security_settings_chooser.xml @@ -31,8 +31,8 @@ android:title="@string/security_enable_widgets_title"/> <PreferenceScreen - android:fragment="com.android.settings.OwnerInfoSettings" android:key="owner_info_settings" + android:fragment="com.android.settings.OwnerInfoSettings" android:title="@string/owner_info_settings_title" android:summary="@string/owner_info_settings_summary"/> diff --git a/res/xml/security_settings_encrypted.xml b/res/xml/security_settings_encrypted.xml index e82dc56..37452f6 100644 --- a/res/xml/security_settings_encrypted.xml +++ b/res/xml/security_settings_encrypted.xml @@ -18,13 +18,13 @@ <PreferenceCategory android:key="security_category" - android:title="@string/crypt_keeper_settings_title" - > + android:title="@string/crypt_keeper_settings_title"> + <Preference style="?android:preferenceInformationStyle" + android:key="crypt_keeper_encrypt_title" android:title="@string/crypt_keeper_encrypt_title" - android:summary="@string/crypt_keeper_encrypted_summary" - /> + android:summary="@string/crypt_keeper_encrypted_summary"/> </PreferenceCategory> diff --git a/res/xml/security_settings_lockscreen.xml b/res/xml/security_settings_lockscreen.xml index eb40bd8..27586e1 100644 --- a/res/xml/security_settings_lockscreen.xml +++ b/res/xml/security_settings_lockscreen.xml @@ -31,8 +31,8 @@ android:title="@string/security_enable_widgets_title"/> <PreferenceScreen - android:fragment="com.android.settings.OwnerInfoSettings" android:key="owner_info_settings" + android:fragment="com.android.settings.OwnerInfoSettings" android:title="@string/owner_info_settings_title" android:summary="@string/owner_info_settings_summary"/> </PreferenceCategory> diff --git a/res/xml/security_settings_misc.xml b/res/xml/security_settings_misc.xml index 58f92d8..84ce96c 100644 --- a/res/xml/security_settings_misc.xml +++ b/res/xml/security_settings_misc.xml @@ -20,7 +20,8 @@ android:title="@string/sim_lock_settings_title" android:persistent="false"> - <Preference android:title="@string/sim_lock_settings_category" + <Preference android:key="sim_lock_settings" + android:title="@string/sim_lock_settings_category" android:persistent="false"> <intent android:action="android.intent.action.MAIN" android:targetPackage="com.android.settings" @@ -40,25 +41,25 @@ android:title="@string/device_admin_title" android:persistent="false"> - <Preference android:title="@string/manage_device_admin" + <Preference android:key="manage_device_admin" + android:title="@string/manage_device_admin" android:summary="@string/manage_device_admin_summary" android:persistent="false" android:fragment="com.android.settings.DeviceAdminSettings"/> - <Preference android:title="@string/manage_trust_agents" + <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" + <CheckBoxPreference android:key="toggle_install_applications" android:title="@string/install_applications" android:summaryOff="@string/install_unknown_applications" android:summaryOn="@string/install_unknown_applications" android:persistent="false" /> - <CheckBoxPreference - android:key="toggle_verify_applications" + <CheckBoxPreference android:key="toggle_verify_applications" android:title="@string/verify_applications" android:summaryOff="@string/verify_applications_summary" android:summaryOn="@string/verify_applications_summary" @@ -74,7 +75,8 @@ style="?android:attr/preferenceInformationStyle" android:persistent="false" /> - <Preference android:title="@string/trusted_credentials" + <Preference android:key="trusted_credentials" + android:title="@string/trusted_credentials" android:summary="@string/trusted_credentials_summary" android:persistent="false" android:fragment="com.android.settings.TrustedCredentialsSettings"/> @@ -88,7 +90,7 @@ android:targetClass="com.android.certinstaller.CertInstallerMain"/> </Preference> - <Preference android:key="reset_credentials" + <Preference android:key="credentials_reset" android:title="@string/credentials_reset" android:summary="@string/credentials_reset_summary" android:persistent="false"> diff --git a/res/xml/security_settings_nfc_unlock.xml b/res/xml/security_settings_nfc_unlock.xml index c3442c6..63e5a74 100644 --- a/res/xml/security_settings_nfc_unlock.xml +++ b/res/xml/security_settings_nfc_unlock.xml @@ -16,27 +16,28 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> - <PreferenceCategory - android:key="security_category" - android:title="@string/lock_settings_nfc_title"> + <PreferenceCategory + android:key="security_category" + android:title="@string/lock_settings_nfc_title"> + <CheckBoxPreference - android:key="nfc_unlock_enabled" - android:title="@string/nfc_unlock_enabled" - android:persistent="false" /> + android:key="nfc_unlock_enabled" + android:title="@string/nfc_unlock_enabled" + android:persistent="false" /> <Preference - android:title="@string/start_nfc_pairing" - android:key="nfc_pairing" - android:persistent="false" - android:dependency="nfc_unlock_enabled" > - <intent android:action="android.settings.PAIR_NFC_DEVICE"/> + android:key="nfc_pairing" + android:title="@string/start_nfc_pairing" + android:persistent="false" + android:dependency="nfc_unlock_enabled" > + <intent android:action="android.settings.PAIR_NFC_DEVICE"/> </Preference> - </PreferenceCategory> - <PreferenceCategory - android:key="nfc_unlock_tags_category" - android:title="@string/nfc_unlock_paired_tags_title"> + </PreferenceCategory> - </PreferenceCategory> + <PreferenceCategory + android:key="nfc_unlock_tags_category" + android:title="@string/nfc_unlock_paired_tags_title"> + </PreferenceCategory> </PreferenceScreen> diff --git a/res/xml/security_settings_password.xml b/res/xml/security_settings_password.xml index a102efa..4ec7a0d 100644 --- a/res/xml/security_settings_password.xml +++ b/res/xml/security_settings_password.xml @@ -43,8 +43,8 @@ android:title="@string/security_enable_widgets_title"/> <PreferenceScreen - android:fragment="com.android.settings.OwnerInfoSettings" android:key="owner_info_settings" + android:fragment="com.android.settings.OwnerInfoSettings" android:title="@string/owner_info_settings_title" android:summary="@string/owner_info_settings_summary"/> diff --git a/res/xml/security_settings_pin.xml b/res/xml/security_settings_pin.xml index 1417e21..bc3b76c 100644 --- a/res/xml/security_settings_pin.xml +++ b/res/xml/security_settings_pin.xml @@ -43,8 +43,8 @@ android:title="@string/security_enable_widgets_title"/> <PreferenceScreen - android:fragment="com.android.settings.OwnerInfoSettings" android:key="owner_info_settings" + android:fragment="com.android.settings.OwnerInfoSettings" android:title="@string/owner_info_settings_title" android:summary="@string/owner_info_settings_summary"/> |