From 00d2476d8fc122b4eef59d6be6f7aa41e9c56fde Mon Sep 17 00:00:00 2001
From: Jim Miller <jaggies@google.com>
Date: Tue, 22 Dec 2009 19:04:57 -0800
Subject: Fix 2332563: Add password-lock support to lockscreen

---
 res/xml/security_settings.xml | 40 +++++++++++++++++++++++++++++++---------
 1 file changed, 31 insertions(+), 9 deletions(-)

(limited to 'res/xml/security_settings.xml')

diff --git a/res/xml/security_settings.xml b/res/xml/security_settings.xml
index 1b73584..d1f896a 100644
--- a/res/xml/security_settings.xml
+++ b/res/xml/security_settings.xml
@@ -4,9 +4,9 @@
      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.
@@ -19,15 +19,15 @@
     <PreferenceCategory
         android:key="location_category"
         android:title="@string/location_title">
-        
-        <CheckBoxPreference 
-            android:key="location_network" 
+
+        <CheckBoxPreference
+            android:key="location_network"
             android:title="@string/location_network_based"
             android:summaryOn="@string/location_neighborhood_level"
             android:summaryOff="@string/location_networks_disabled"/>
-        
-        <CheckBoxPreference 
-            android:key="location_gps" 
+
+        <CheckBoxPreference
+            android:key="location_gps"
             android:title="@string/location_gps"
             android:summaryOn="@string/location_street_level"
             android:summaryOff="@string/location_gps_disabled"/>
@@ -42,5 +42,27 @@
 -->
 
     </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>
-- 
cgit v1.1