PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 340990a2: am af487099: Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1

Browse Source 
* commit '340990a2d29f566b83dc551e3c5f748c96bd99f2':
  Fix 4560303: Add setting to lock later when power button pressed
This commit is contained in:
Jim Miller
2012-01-10 10:32:40 -08:00
committed by Android Git Automerger
parent 201896e983 340990a2d2
commit 325d1ab157
6 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/xml/security_settings_biometric_weak.xml
View File

@@ -42,6 +42,10 @@
android:entryValues="@array/lock_after_timeout_values"
android:persistent="false"/>
<CheckBoxPreference
android:key="power_button_instantly_locks"
android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/>
<CheckBoxPreference
android:key="unlock_tactile_feedback"
android:title="@string/lockpattern_settings_enable_tactile_feedback_title"/>

4
res/xml/security_settings_password.xml
View File

@@ -34,6 +34,10 @@
android:entryValues="@array/lock_after_timeout_values"
android:persistent="false"/>
<CheckBoxPreference
android:key="power_button_instantly_locks"
android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/>
<PreferenceScreen
android:fragment="com.android.settings.OwnerInfoSettings"
android:key="owner_info_settings"

4
res/xml/security_settings_pattern.xml
View File

@@ -38,6 +38,10 @@
android:entryValues="@array/lock_after_timeout_values"
android:persistent="false"/>
<CheckBoxPreference
android:key="power_button_instantly_locks"
android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/>
<CheckBoxPreference
android:key="unlock_tactile_feedback"
android:title="@string/lockpattern_settings_enable_tactile_feedback_title"/>

4
res/xml/security_settings_pin.xml
View File

@@ -34,6 +34,10 @@
android:entryValues="@array/lock_after_timeout_values"
android:persistent="false"/>
<CheckBoxPreference
android:key="power_button_instantly_locks"
android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/>
<CheckBoxPreference
android:key="unlock_tactile_feedback"
android:title="@string/lockpattern_settings_enable_tactile_feedback_title"/>