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

Merge "Block settings when DISALLOW_CONFIG_AMBIENT_DISPLAY."

Browse Source
This commit is contained in:
TreeHugger Robot
2018-01-17 02:17:19 +00:00
committed by Android (Google) Code Review
parent e7745b128a b4fc5ced62
commit c74ba59aec
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/xml/display_settings.xml
View File

@@ -99,10 +99,11 @@
android:fragment="com.android.settings.dream.DreamSettings" /> android:fragment="com.android.settings.dream.DreamSettings" />
<!-- Cross-listed item, if you change this, also change it in power_usage_summary.xml --> <!-- Cross-listed item, if you change this, also change it in power_usage_summary.xml -->
<Preference <com.android.settingslib.RestrictedPreference
android:key="ambient_display" android:key="ambient_display"
android:title="@string/ambient_display_screen_title" android:title="@string/ambient_display_screen_title"
android:fragment="com.android.settings.display.AmbientDisplaySettings" /> android:fragment="com.android.settings.display.AmbientDisplaySettings"
settings:userRestriction="no_ambient_display" />
<!-- Hide night mode for now <!-- Hide night mode for now
<ListPreference <ListPreference

5
res/xml/power_usage_summary_legacy.xml
View File

@@ -78,10 +78,11 @@
android:entryValues="@array/screen_timeout_values"/> android:entryValues="@array/screen_timeout_values"/>
<!-- Cross-listed item, if you change this, also change it in display_settings.xml --> <!-- Cross-listed item, if you change this, also change it in display_settings.xml -->
<Preference <com.android.settingslib.RestrictedPreference
android:key="ambient_display_battery" android:key="ambient_display_battery"
android:title="@string/ambient_display_screen_title" android:title="@string/ambient_display_screen_title"
android:fragment="com.android.settings.display.AmbientDisplaySettings" /> android:fragment="com.android.settings.display.AmbientDisplaySettings"
settings:userRestriction="no_ambient_display" />
</PreferenceCategory> </PreferenceCategory>