Fix 3333490,3250193: Update LockScreen settings
This updates LockScreen to conform to the latest UI design.
Change-Id: Ie88a26db7912ddb4331804e347189cc084c481f4
diff --git a/res/xml/security_settings_chooser.xml b/res/xml/security_settings_chooser.xml
index 7b5d9c9..60d3a9f 100644
--- a/res/xml/security_settings_chooser.xml
+++ b/res/xml/security_settings_chooser.xml
@@ -23,7 +23,7 @@
<PreferenceScreen
android:key="unlock_set_or_change"
android:title="@string/unlock_set_unlock_launch_picker_title"
- android:summary="@string/unlock_set_unlock_launch_picker_summary"
+ android:summary="@string/unlock_set_unlock_mode_none"
android:persistent="false"/>
<PreferenceScreen
diff --git a/res/xml/security_settings_lockscreen.xml b/res/xml/security_settings_lockscreen.xml
index f66151d..fbdee60 100644
--- a/res/xml/security_settings_lockscreen.xml
+++ b/res/xml/security_settings_lockscreen.xml
@@ -22,8 +22,8 @@
<PreferenceScreen
android:key="unlock_set_or_change"
- android:title="@string/unlock_set_unlock_launch_picker_enable_title"
- android:summary="@string/unlock_set_unlock_launch_picker_enable_summary"
+ android:title="@string/unlock_set_unlock_launch_picker_title"
+ android:summary="@string/unlock_set_unlock_mode_off"
android:persistent="false"/>
</PreferenceCategory>
diff --git a/res/xml/security_settings_password.xml b/res/xml/security_settings_password.xml
index 369f9ce..936f181 100644
--- a/res/xml/security_settings_password.xml
+++ b/res/xml/security_settings_password.xml
@@ -20,6 +20,12 @@
android:key="security_category"
android:title="@string/lock_settings_title">
+ <PreferenceScreen
+ android:key="unlock_set_or_change"
+ android:title="@string/unlock_set_unlock_launch_picker_title"
+ android:summary="@string/unlock_set_unlock_mode_password"
+ android:persistent="false"/>
+
<ListPreference
android:key="lock_after_timeout"
android:title="@string/lock_after_timeout"
@@ -28,12 +34,6 @@
android:entryValues="@array/lock_after_timeout_values"
android:persistent="false"/>
- <PreferenceScreen
- android:key="unlock_set_or_change"
- android:title="@string/unlock_set_unlock_launch_picker_change_title"
- android:summary="@string/unlock_set_unlock_launch_picker_change_summary"
- android:persistent="false"/>
-
<CheckBoxPreference
android:key="unlock_tactile_feedback"
android:title="@string/lockpattern_settings_enable_tactile_feedback_title"/>
diff --git a/res/xml/security_settings_pattern.xml b/res/xml/security_settings_pattern.xml
index 4ff9214..4cfc360 100644
--- a/res/xml/security_settings_pattern.xml
+++ b/res/xml/security_settings_pattern.xml
@@ -20,6 +20,16 @@
android:key="security_category"
android:title="@string/lock_settings_title">
+ <PreferenceScreen
+ android:key="unlock_set_or_change"
+ android:title="@string/unlock_set_unlock_launch_picker_title"
+ android:summary="@string/unlock_set_unlock_mode_pattern"
+ android:persistent="false"/>
+
+ <CheckBoxPreference
+ android:key="visiblepattern"
+ android:title="@string/lockpattern_settings_enable_visible_pattern_title"/>
+
<ListPreference
android:key="lock_after_timeout"
android:title="@string/lock_after_timeout"
@@ -28,16 +38,6 @@
android:entryValues="@array/lock_after_timeout_values"
android:persistent="false"/>
- <PreferenceScreen
- android:key="unlock_set_or_change"
- android:title="@string/unlock_set_unlock_launch_picker_change_title"
- android:summary="@string/unlock_set_unlock_launch_picker_change_summary"
- android:persistent="false"/>
-
- <CheckBoxPreference
- android:key="visiblepattern"
- android:title="@string/lockpattern_settings_enable_visible_pattern_title"/>
-
<CheckBoxPreference
android:key="unlock_tactile_feedback"
android:title="@string/lockpattern_settings_enable_tactile_feedback_title"/>
diff --git a/res/xml/security_settings_pin.xml b/res/xml/security_settings_pin.xml
index 369f9ce..0c8ff97 100644
--- a/res/xml/security_settings_pin.xml
+++ b/res/xml/security_settings_pin.xml
@@ -20,6 +20,12 @@
android:key="security_category"
android:title="@string/lock_settings_title">
+ <PreferenceScreen
+ android:key="unlock_set_or_change"
+ android:title="@string/unlock_set_unlock_launch_picker_title"
+ android:summary="@string/unlock_set_unlock_mode_pin"
+ android:persistent="false"/>
+
<ListPreference
android:key="lock_after_timeout"
android:title="@string/lock_after_timeout"
@@ -28,12 +34,6 @@
android:entryValues="@array/lock_after_timeout_values"
android:persistent="false"/>
- <PreferenceScreen
- android:key="unlock_set_or_change"
- android:title="@string/unlock_set_unlock_launch_picker_change_title"
- android:summary="@string/unlock_set_unlock_launch_picker_change_summary"
- android:persistent="false"/>
-
<CheckBoxPreference
android:key="unlock_tactile_feedback"
android:title="@string/lockpattern_settings_enable_tactile_feedback_title"/>