From b4fc5ced627b2b165619464d8282bfa1b2c1685c Mon Sep 17 00:00:00 2001
From: yuemingw <yuemingw@google.com>
Date: Wed, 10 Jan 2018 21:02:14 +0000
Subject: [PATCH] Block settings when DISALLOW_CONFIG_AMBIENT_DISPLAY.

Test: m -j RunSettingsRoboTests
Fix: 67675787

Change-Id: Ibf5786982e258decea4486431faa45ff1b7480ef
---
 res/xml/display_settings.xml           | 5 +++--
 res/xml/power_usage_summary_legacy.xml | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 4b285d3dc10..4d0c99259a7 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -99,10 +99,11 @@
         android:fragment="com.android.settings.dream.DreamSettings" />
 
     <!-- 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: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
     <ListPreference
diff --git a/res/xml/power_usage_summary_legacy.xml b/res/xml/power_usage_summary_legacy.xml
index 5af6bc10aa8..0038cc0fb2f 100644
--- a/res/xml/power_usage_summary_legacy.xml
+++ b/res/xml/power_usage_summary_legacy.xml
@@ -78,10 +78,11 @@
             android:entryValues="@array/screen_timeout_values"/>
 
         <!-- 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: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>