Update SecuritySettings to use SwitchPreference
Fixes bug 16900059
Change-Id: Ic3d498c3c4da32f1ba75559073957bb1087912f1
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"/>