Fix 2332563: Update logic for lockscreen in Settings.

9 files changed, 255 insertions, 60 deletions

diff --git a/res/layout-land/choose_lock_password.xml b/res/layout-land/choose_lock_password.xml
index eba936a..f2a2f46 100644
--- a/res/layout-land/choose_lock_password.xml
+++ b/res/layout-land/choose_lock_password.xml
@@ -53,6 +53,8 @@
             android:gravity="center"
             android:layout_gravity="center"
             android:textSize="24sp"
+            android:layout_marginTop="5dip"
+            android:layout_marginBottom="5dip"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:background="@drawable/password_field_default"
             android:textColor="#ffffffff"
@@ -77,14 +79,15 @@
     <RelativeLayout
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
-        android:background="@android:drawable/bottom_bar">
+        android:background="@android:drawable/bottom_bar"
+        android:visibility="gone">
 
         <Button android:id="@+id/cancel_button"
             android:layout_width="150dip"
             android:layout_height="wrap_content"
             android:layout_margin="5dip"
             android:layout_alignParentLeft="true"
-            android:text="@string/password_cancel_button_label"
+            android:text="@string/lockpassword_cancel_label"
         />
 
         <Button android:id="@+id/next_button"
@@ -94,7 +97,7 @@
             android:layout_alignParentRight="true"
             android:drawableRight="@drawable/ic_btn_next"
             android:drawablePadding="10dip"
-            android:text="@string/password_ok_button_label"
+            android:text="@string/lockpassword_continue_label"
         />
 
     </RelativeLayout>
diff --git a/res/layout/choose_lock_password.xml b/res/layout/choose_lock_password.xml
index ffef021..3ab1374 100644
--- a/res/layout/choose_lock_password.xml
+++ b/res/layout/choose_lock_password.xml
@@ -84,7 +84,7 @@
             android:layout_height="wrap_content"
             android:layout_margin="5dip"
             android:layout_alignParentLeft="true"
-            android:text="@string/password_cancel_button_label"
+            android:text="@string/lockpassword_cancel_label"
         />
 
         <Button android:id="@+id/next_button"
@@ -94,7 +94,7 @@
             android:layout_alignParentRight="true"
             android:drawableRight="@drawable/ic_btn_next"
             android:drawablePadding="10dip"
-            android:text="@string/password_ok_button_label"
+            android:text="@string/lockpassword_continue_label"
         />
 
     </RelativeLayout>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 4ac663b..ae0fba8 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -98,22 +98,6 @@
         <item>1800000</item>
     </string-array>
 
-    <!-- Unlock method in SecuritySettings --><skip/>
-    <string-array name="unlock_method_entries">
-        <item>Password</item>
-        <item>PIN</item>
-        <item>Pattern</item>
-        <item>None</item>
-    </string-array>
-
-    <!-- Do not translate. -->
-    <string-array name="unlock_method_values" translatable="false">
-        <item>password</item>
-        <item>pin</item>
-        <item>pattern</item>
-        <item>none</item>
-    </string-array>
-
     <!-- TTS settings -->
 
     <!-- Default speech rate choices -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4c960ec..18bac1a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -516,28 +516,81 @@
     <string name="cdma_security_settings_summary">Set My Location, screen unlock, credential storage lock</string>
     <!-- In the security screen, the header title for settings related to  Passwords-->
     <string name="security_passwords_title">Passwords</string>
-    <!-- Name shown for changing the unlock method -->
-    <string name="unlock_method_title">Unlock Method</string>
-    <!-- Summary shown for changing the unlock method -->
-    <string name="unlock_method_summary">Change the method used to unlock your phone</string>
-    <!-- Error shown in popup when PIN is too short -->
-    <string name="pin_password_too_short">Password must be at least %d digits</string>
+
+    
+    <!-- Unlock settings --><skip />
+
+    <!-- Title for preference that will guide the user through creating an unlock pattern -->
+    <string name="unlock_set_unlock_pattern_title">Set unlock pattern</string>
+    <!-- Summary for preference that guides the user through creating an unlock pattern -->
+    <string name="unlock_set_unlock_pattern_summary">Must draw pattern to unlock screen</string>
+
+    <!-- Title for preference that guides the user through creating an unlock PIN (Personal Identification Number)  -->
+    <string name="unlock_set_unlock_pin_title">Set unlock PIN</string>
+    <!-- Summary for preference that guides the user through creating an unlock PIN (Personal Identification Number)  -->
+    <string name="unlock_set_unlock_pin_summary">Must use a numeric PIN to unlock screen</string>
+
+    <!-- Title for preference that guides the user through creating an unlock password -->
+    <string name="unlock_set_unlock_password_title">Set unlock password</string>
+    <!-- Title for preference that guides the user through creating an unlock password -->
+    <string name="unlock_set_unlock_password_summary">Must use a password to unlock screen</string>
+
+    <!-- Title for option to turn of password/pin/pattern unlock. -->
+    <string name="unlock_disable_lock_title">Turn off screen lock</string>
+
+    <!-- Summary shown under unlock_disable_lock_title when pattern is in use and can be removed -->
+    <string name="unlock_disable_lock_pattern_summary">Remove unlock pattern</string>
+    <!-- Summary shown under unlock_disable_lock_title when PIN is in use and can be removed -->
+    <string name="unlock_disable_lock_pin_summary">Remove unlock PIN</string>
+    <!-- Summary shown under unlock_disable_lock_title when password is in use and can be removed -->
+    <string name="unlock_disable_lock_password_summary">Remove unlock password</string>
+
+    <!-- Title shown on security settings to allow the user to change their lockscreen pattern -->
+    <string name="unlock_change_lock_pattern_title">Change unlock pattern</string>
+    <!-- Title shown on security settings to allow the user to change their lockscreen PIN -->
+    <string name="unlock_change_lock_pin_title">Change unlock PIN</string>
+    <!-- Title shown on security settings to allow the user to change their lockscreen password -->
+    <string name="unlock_change_lock_password_title">Change unlock password</string>
+
+    <!-- Hint shown in dialog screen when password is too short -->
+    <string name="lockpassword_password_too_short">Password must be at least %d characters</string>
+    <!-- Hint shown in dialog screen when PIN is too short -->
+    <string name="lockpassword_pin_too_short">PIN must be at least %d characters</string>
+
+    <!-- Hint shown after minimum password criteria is met -->
+    <string name="lockpassword_press_continue">Press Continue when done</string>
+
+    <!-- Hint shown after minimum password criteria is met -->
+    <string name="lockpassword_continue_label">Continue</string>
+
+    <!-- Error shown in popup when password is too long -->
+    <string name="lockpassword_password_too_long">PIN can be no longer than %d digits</string>
     <!-- Error shown in popup when PIN is too long -->
-    <string name="pin_password_too_long">Password can be no longer than %d digits</string>
+    <string name="lockpassword_pin_too_long">PIN can be no longer than %d digits</string>
+
     <!-- Error shown when in PIN mode and user enters a non-digit -->
-    <string name="pin_password_illegal_character">PIN must contain only digits 0-9</string>
+    <string name="lockpassword_pin_contains_non_digits">PIN must contain only digits 0-9</string>
+
     <!-- Error shown when in PASSWORD mode and user enters an invalid character -->
-    <string name="pin_password_contains_non_digits">Password contains an illegal character</string>
+    <string name="lockpassword_illegal_character">Password contains an illegal character</string>
+
+    <!-- Error shown when in PASSWORD mode and password is all digits -->
+    <string name="lockpassword_password_requires_alpha">Alpha password must contain at least one letter</string>
+
+    <!-- Label for ChoosePassword/PIN OK button -->
+    <string name="lockpassword_ok_label">OK</string>
+
+    <!-- Label for ChoosePassword/PIN OK button -->
+    <string name="lockpassword_cancel_label">Cancel</string>
+
     <!-- In the security screen, the header title for settings related to device admins -->
     <string name="device_admin_title">Device administration</string>
+
     <!-- Title of preference to manage device admins -->
     <string name="manage_device_admin">Select device administrators</string>
+
     <!-- Summary of preference to manage device policies -->
     <string name="manage_device_admin_summary">Add or remove device administrators</string>
-    <!-- Label for ChoosePassword/PIN OK button -->
-    <string name="password_ok_button_label">OK</string>
-    <!-- Label for ChoosePassword/PIN OK button -->
-    <string name="password_cancel_button_label">Cancel</string>
 
     <!-- Bluetooth settings -->
     <!-- Bluetooth settings check box title on Main Settings screen -->
@@ -1350,16 +1403,26 @@
     <!-- Lock Pattern settings -->
     <!-- Header on first screen of choose password/PIN flow -->
     <string name="lockpassword_choose_your_password_header">Choose your password</string>
+    <!-- Header on first screen of choose password/PIN flow -->
+    <string name="lockpassword_choose_your_pin_header">Choose your PIN</string>
+    <!-- Header on password confirm screen -->
+    <string name="lockpassword_confirm_your_password_header">Confirm your password</string>
     <!-- Header on password confirm screen -->
-    <string name="lockpassword_confirm_your_password_header">Confirm password</string>
+    <string name="lockpassword_confirm_your_pin_header">Confirm your PIN</string>
     <!-- Header on password confirm screen if second password doesn't match the first. -->
     <string name="lockpassword_confirm_passwords_dont_match">Passwords don\'t match</string>
-    <!-- Header shown if passwords match -->
-    <string name="lockpassword_password_confirmed_header">Password confirmed</string>
+    <!-- Header on pin confirm screen if second pin doesn't match the first. -->
+    <string name="lockpassword_confirm_pins_dont_match">PINs don\'t match</string>
+    <!-- Toast shown if setting password was successful -->
+    <string name="lockpassword_password_set_toast">Password has been set</string>
+    <!-- Toast shown if setting PIN was successful -->
+    <string name="lockpassword_pin_set_toast">PIN has been set</string>
+    <!-- Toast shown if setting pattern was successful -->
+    <string name="lockpassword_pattern_set_toast">Pattern has been set</string>
 
     <!-- Lock Pattern settings -->
     <!-- Security & location settings screen, header -->
-    <string name="lock_settings_title">Screen unlock pattern</string>
+    <string name="lock_settings_title">Screen unlock</string>
     <!-- Security & location settings screen, setting option name -->
     <string name="lockpattern_change_lock_pattern_label">Change unlock pattern</string>
     <!-- Security & location settings screen, change unlock pattern screen instruction when the user chooses "Change unlock pattern".  We first ask the user toe nter the current pattern, and this is the message seen -->
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..4f5797f
--- /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>