diff options
| author | Jim Miller <jaggies@google.com> | 2009-12-22 19:04:57 -0800 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2010-01-11 15:51:59 -0800 |
| commit | 00d2476d8fc122b4eef59d6be6f7aa41e9c56fde (patch) | |
| tree | b0eb0da4a8fcf173d8fc7d5632f0776722dbb0c7 /res/xml | |
| parent | 8edfd3a76be936b255484dc20bbeba0050e66e75 (diff) | |
| download | packages_apps_Settings-00d2476d8fc122b4eef59d6be6f7aa41e9c56fde.zip packages_apps_Settings-00d2476d8fc122b4eef59d6be6f7aa41e9c56fde.tar.gz packages_apps_Settings-00d2476d8fc122b4eef59d6be6f7aa41e9c56fde.tar.bz2 | |
Fix 2332563: Add password-lock support to lockscreen
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/security_settings.xml | 40 |
1 files changed, 31 insertions, 9 deletions
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> |