Fix 2332563: Update logic for lockscreen in Settings.
diff --git a/res/xml/security_settings.xml b/res/xml/security_settings.xml
index d1f896a..29244f7 100644
--- a/res/xml/security_settings.xml
+++ b/res/xml/security_settings.xml
@@ -43,26 +43,4 @@
</PreferenceCategory>
- <PreferenceCategory
- android:key="security_category"
- android:title="@string/lock_settings_title">
-
- <ListPreference
- android:key="unlock_method"
- android:title="@string/unlock_method_title"
- android:summary="@string/unlock_method_summary"
- android:persistent="false"
- android:entries="@array/unlock_method_entries"
- android:entryValues="@array/unlock_method_values"/>
-
- <CheckBoxPreference
- android:key="visiblepattern"
- android:title="@string/lockpattern_settings_enable_visible_pattern_title"/>
-
- <CheckBoxPreference
- android:key="tactilefeedback"
- android:title="@string/lockpattern_settings_enable_tactile_feedback_title"/>
-
- </PreferenceCategory>
-
</PreferenceScreen>
diff --git a/res/xml/security_settings_chooser.xml b/res/xml/security_settings_chooser.xml
new file mode 100644
index 0000000..4f5797f4
--- /dev/null
+++ b/res/xml/security_settings_chooser.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <PreferenceCategory
+ android:key="security_category"
+ android:title="@string/lock_settings_title">
+
+ <PreferenceScreen
+ android:key="unlock_set_pattern"
+ android:title="@string/unlock_set_unlock_pattern_title"
+ android:summary="@string/unlock_set_unlock_pattern_summary"
+ android:persistent="false"/>
+
+ <PreferenceScreen
+ android:key="unlock_set_pin"
+ android:title="@string/unlock_set_unlock_pin_title"
+ android:summary="@string/unlock_set_unlock_pin_summary"
+ android:persistent="false"/>
+
+ <PreferenceScreen
+ android:key="unlock_set_password"
+ android:title="@string/unlock_set_unlock_password_title"
+ android:summary="@string/unlock_set_unlock_password_summary"
+ android:persistent="false"/>
+
+ </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/res/xml/security_settings_password.xml b/res/xml/security_settings_password.xml
new file mode 100644
index 0000000..9addee4
--- /dev/null
+++ b/res/xml/security_settings_password.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <PreferenceCategory
+ android:key="security_category"
+ android:title="@string/lock_settings_title">
+
+ <PreferenceScreen
+ android:key="unlock_method_disable"
+ android:title="@string/unlock_disable_lock_title"
+ android:summary="@string/unlock_disable_lock_password_summary"
+ android:persistent="false"/>
+
+ <PreferenceScreen
+ android:key="unlock_method_change_current"
+ android:title="@string/unlock_change_lock_password_title"
+ android:persistent="false"/>
+
+ <CheckBoxPreference
+ android:key="unlock_tactile_feedback"
+ android:title="@string/lockpattern_settings_enable_tactile_feedback_title"/>
+
+ </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/res/xml/security_settings_pattern.xml b/res/xml/security_settings_pattern.xml
new file mode 100644
index 0000000..467fbd7
--- /dev/null
+++ b/res/xml/security_settings_pattern.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <PreferenceCategory
+ android:key="security_category"
+ android:title="@string/lock_settings_title">
+
+ <PreferenceScreen
+ android:key="unlock_method_disable"
+ android:title="@string/unlock_disable_lock_title"
+ android:summary="@string/unlock_disable_lock_pattern_summary"
+ android:persistent="false"/>
+
+ <PreferenceScreen
+ android:key="unlock_method_change_current"
+ android:title="@string/unlock_change_lock_pattern_title"
+ 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"/>
+
+ </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/res/xml/security_settings_pin.xml b/res/xml/security_settings_pin.xml
new file mode 100644
index 0000000..fb77714
--- /dev/null
+++ b/res/xml/security_settings_pin.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <PreferenceCategory
+ android:key="security_category"
+ android:title="@string/lock_settings_title">
+
+ <PreferenceScreen
+ android:key="unlock_method_disable"
+ android:title="@string/unlock_disable_lock_title"
+ android:summary="@string/unlock_disable_lock_pin_summary"
+ android:persistent="false"/>
+
+ <PreferenceScreen
+ android:key="unlock_method_change_current"
+ android:title="@string/unlock_change_lock_pin_title"
+ android:persistent="false"/>
+
+ <CheckBoxPreference
+ android:key="unlock_tactile_feedback"
+ android:title="@string/lockpattern_settings_enable_tactile_feedback_title"/>
+
+ </PreferenceCategory>
+
+</PreferenceScreen>