Fix 2332563: Add password-lock support to lockscreen
This commit is contained in:
@@ -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>
|
||||
|
Reference in New Issue
Block a user