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

Merge "Set default display timeout if current value is disabled by admin."

Browse Source
This commit is contained in:
TreeHugger Robot
2018-06-26 06:55:48 +00:00
committed by Android (Google) Code Review
parent 4d4e6ab87a 30692040be
commit ce287b9fb6
10 changed files with 139 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/xml/display_settings.xml
View File

@@ -57,7 +57,7 @@
</com.android.settingslib.RestrictedPreference>
<!-- Cross-listed item, if you change this, also change it in power_usage_summary.xml -->
<com.android.settings.TimeoutListPreference
<com.android.settings.display.TimeoutListPreference
android:key="screen_timeout"
android:title="@string/screen_timeout"
android:summary="@string/summary_placeholder"

2
res/xml/screen_lock_settings.xml
View File

@@ -26,7 +26,7 @@
android:title="@string/lockpattern_settings_enable_visible_pattern_title" />
<!-- available in pin/pattern/password -->
<com.android.settings.TimeoutListPreference
<com.android.settings.display.TimeoutListPreference
android:key="lock_after_timeout"
android:title="@string/lock_after_timeout"
android:summary="@string/summary_placeholder"