diff options
author | Jim Miller <jaggies@google.com> | 2014-08-12 00:49:10 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-11 18:14:57 +0000 |
commit | 898671f14123695d74bd308450a462d11a341d1a (patch) | |
tree | d5e545add3b1f408f602e463c611ce234a902d0c /res/xml | |
parent | 19465fa3eb8f9a4047f83cf422a77c3b0c2e19f6 (diff) | |
parent | 4a9065e6547c24c751b0aecbc151e57bcbcf92ea (diff) | |
download | packages_apps_Settings-898671f14123695d74bd308450a462d11a341d1a.zip packages_apps_Settings-898671f14123695d74bd308450a462d11a341d1a.tar.gz packages_apps_Settings-898671f14123695d74bd308450a462d11a341d1a.tar.bz2 |
Merge "Update SecuritySettings to use SwitchPreference" into lmp-dev
Diffstat (limited to 'res/xml')
-rw-r--r-- | res/xml/security_settings_biometric_weak.xml | 6 | ||||
-rw-r--r-- | res/xml/security_settings_misc.xml | 4 | ||||
-rw-r--r-- | res/xml/security_settings_password.xml | 2 | ||||
-rw-r--r-- | res/xml/security_settings_pattern.xml | 4 | ||||
-rw-r--r-- | res/xml/security_settings_pin.xml | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/res/xml/security_settings_biometric_weak.xml b/res/xml/security_settings_biometric_weak.xml index 750a270..4879fe6 100644 --- a/res/xml/security_settings_biometric_weak.xml +++ b/res/xml/security_settings_biometric_weak.xml @@ -31,12 +31,12 @@ android:key="biometric_weak_improve_matching" android:title="@string/biometric_weak_improve_matching_title"/> - <CheckBoxPreference + <SwitchPreference android:key="biometric_weak_liveliness" android:title="@string/biometric_weak_liveliness_title" android:summary="@string/biometric_weak_liveliness_summary"/> - <CheckBoxPreference + <SwitchPreference android:key="visiblepattern" android:title="@string/lockpattern_settings_enable_visible_pattern_title"/> @@ -48,7 +48,7 @@ android:entryValues="@array/lock_after_timeout_values" android:persistent="false"/> - <CheckBoxPreference + <SwitchPreference android:key="power_button_instantly_locks" android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/> diff --git a/res/xml/security_settings_misc.xml b/res/xml/security_settings_misc.xml index 7219a6c..a0e81b2 100644 --- a/res/xml/security_settings_misc.xml +++ b/res/xml/security_settings_misc.xml @@ -36,7 +36,7 @@ <PreferenceCategory android:title="@string/security_passwords_title" android:persistent="false"> - <CheckBoxPreference android:key="show_password" + <SwitchPreference android:key="show_password" android:title="@string/show_password" android:persistent="false"/> @@ -52,7 +52,7 @@ android:persistent="false" android:fragment="com.android.settings.DeviceAdminSettings"/> - <CheckBoxPreference android:key="toggle_install_applications" + <SwitchPreference android:key="toggle_install_applications" android:title="@string/install_applications" android:summaryOff="@string/install_unknown_applications" android:summaryOn="@string/install_unknown_applications" diff --git a/res/xml/security_settings_password.xml b/res/xml/security_settings_password.xml index bb9c360..b6ea76e 100644 --- a/res/xml/security_settings_password.xml +++ b/res/xml/security_settings_password.xml @@ -35,7 +35,7 @@ android:entryValues="@array/lock_after_timeout_values" android:persistent="false"/> - <CheckBoxPreference + <SwitchPreference android:key="power_button_instantly_locks" android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/> diff --git a/res/xml/security_settings_pattern.xml b/res/xml/security_settings_pattern.xml index 168a685..cb848c6 100644 --- a/res/xml/security_settings_pattern.xml +++ b/res/xml/security_settings_pattern.xml @@ -27,7 +27,7 @@ android:summary="@string/unlock_set_unlock_mode_pattern" android:persistent="false"/> - <CheckBoxPreference + <SwitchPreference android:key="visiblepattern" android:title="@string/lockpattern_settings_enable_visible_pattern_title"/> @@ -39,7 +39,7 @@ android:entryValues="@array/lock_after_timeout_values" android:persistent="false"/> - <CheckBoxPreference + <SwitchPreference android:key="power_button_instantly_locks" android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/> diff --git a/res/xml/security_settings_pin.xml b/res/xml/security_settings_pin.xml index 4ead03f..e45bdf5 100644 --- a/res/xml/security_settings_pin.xml +++ b/res/xml/security_settings_pin.xml @@ -35,7 +35,7 @@ android:entryValues="@array/lock_after_timeout_values" android:persistent="false"/> - <CheckBoxPreference + <SwitchPreference android:key="power_button_instantly_locks" android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/> |