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

Merge "Follow up to I15baa5b1d19324521070d641ae6a227d782a4e9e"

Browse Source
This commit is contained in:
Adrian Roos
2016-01-29 20:44:15 +00:00
committed by Android (Google) Code Review
parent 49323d3387 ef5445f8c2
commit 0586321e96
4 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/xml/security_settings_password_sub.xml
View File

@@ -24,8 +24,7 @@
android:title="@string/lock_after_timeout" android:title="@string/lock_after_timeout"
android:summary="@string/lock_after_timeout_summary" android:summary="@string/lock_after_timeout_summary"
android:entries="@array/lock_after_timeout_entries" android:entries="@array/lock_after_timeout_entries"
android:entryValues="@array/lock_after_timeout_values" android:entryValues="@array/lock_after_timeout_values" />
android:persistent="false"/>
<SwitchPreference <SwitchPreference
android:key="power_button_instantly_locks" android:key="power_button_instantly_locks"

3
res/xml/security_settings_pattern_sub.xml
View File

@@ -28,8 +28,7 @@
android:title="@string/lock_after_timeout" android:title="@string/lock_after_timeout"
android:summary="@string/lock_after_timeout_summary" android:summary="@string/lock_after_timeout_summary"
android:entries="@array/lock_after_timeout_entries" android:entries="@array/lock_after_timeout_entries"
android:entryValues="@array/lock_after_timeout_values" android:entryValues="@array/lock_after_timeout_values" />
android:persistent="false"/>
<SwitchPreference <SwitchPreference
android:key="power_button_instantly_locks" android:key="power_button_instantly_locks"

3
res/xml/security_settings_pin_sub.xml
View File

@@ -24,8 +24,7 @@
android:title="@string/lock_after_timeout" android:title="@string/lock_after_timeout"
android:summary="@string/lock_after_timeout_summary" android:summary="@string/lock_after_timeout_summary"
android:entries="@array/lock_after_timeout_entries" android:entries="@array/lock_after_timeout_entries"
android:entryValues="@array/lock_after_timeout_values" android:entryValues="@array/lock_after_timeout_values" />
android:persistent="false"/>
<SwitchPreference <SwitchPreference
android:key="power_button_instantly_locks" android:key="power_button_instantly_locks"

1
src/com/android/settings/GearPreference.java
View File

@@ -36,6 +36,7 @@ public class GearPreference extends Preference implements View.OnClickListener {
public void setOnGearClickListener(OnGearClickListener l) { public void setOnGearClickListener(OnGearClickListener l) {
mOnGearClickListener = l; mOnGearClickListener = l;
notifyChanged();
} }
@Override @Override