Merge "Improved UX when DISALLOW_SET_WALLPAPER is set." into nyc-dev am: 76a2981
am: 717ed0e
* commit '717ed0eed7bf60ed5163b8139bfdf7fc4f8a3072':
Improved UX when DISALLOW_SET_WALLPAPER is set.
Change-Id: I8d712b436c36041f28e3a1d0871b2a3d83a265f3
This commit is contained in:
@@ -41,11 +41,12 @@
|
||||
android:entries="@array/night_mode_entries"
|
||||
android:entryValues="@array/night_mode_values" /> -->
|
||||
|
||||
<PreferenceScreen
|
||||
<com.android.settingslib.RestrictedPreference
|
||||
android:key="wallpaper"
|
||||
android:title="@string/wallpaper_settings_title"
|
||||
settings:keywords="@string/keywords_display_wallpaper"
|
||||
android:fragment="com.android.settings.WallpaperTypeSettings" />
|
||||
android:fragment="com.android.settings.WallpaperTypeSettings"
|
||||
settings:useAdminDisabledSummary="true" />
|
||||
|
||||
<com.android.settings.TimeoutListPreference
|
||||
android:key="screen_timeout"
|
||||
|
||||
Reference in New Issue
Block a user