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

Merge "Add restricted padlock support for listpreference."

Browse Source
This commit is contained in:
Sudheer Shanka
2016-01-26 22:29:43 +00:00
committed by Android (Google) Code Review
parent 679fde4c15 550d068abd
commit 49e9f612d1
10 changed files with 448 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/xml/display_settings.xml
View File

@@ -49,7 +49,7 @@
settings:keywords="@string/keywords_display_wallpaper"
android:fragment="com.android.settings.WallpaperTypeSettings" />
<ListPreference
<com.android.settings.RestrictedListPreference
android:key="screen_timeout"
android:title="@string/screen_timeout"
android:summary="@string/screen_timeout_summary"

2
res/xml/security_settings_password.xml
View File

@@ -29,7 +29,7 @@
settings:keywords="@string/keywords_lockscreen"
android:persistent="false"/>
<ListPreference
<com.android.settings.RestrictedListPreference
android:key="lock_after_timeout"
android:title="@string/lock_after_timeout"
android:summary="@string/lock_after_timeout_summary"

2
res/xml/security_settings_pattern.xml
View File

@@ -33,7 +33,7 @@
android:key="visiblepattern"
android:title="@string/lockpattern_settings_enable_visible_pattern_title"/>
<ListPreference
<com.android.settings.RestrictedListPreference
android:key="lock_after_timeout"
android:title="@string/lock_after_timeout"
android:summary="@string/lock_after_timeout_summary"

2
res/xml/security_settings_pin.xml
View File

@@ -29,7 +29,7 @@
settings:keywords="@string/keywords_lockscreen"
android:persistent="false"/>
<ListPreference
<com.android.settings.RestrictedListPreference
android:key="lock_after_timeout"
android:title="@string/lock_after_timeout"
android:summary="@string/lock_after_timeout_summary"