commit a95be3f49bb79921f800287ff8f4694e6eae8d47
author Matthew Fritze <mfritze@google.com> Tue Dec 20 21:49:17 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 20 21:49:17 2016 +0000
tree c4fa8423cfe4aafc9db1b4ad7a8d80a8bfb93cfe
parent 829faf6c45ade19e75d09d627425de8d3dc13119
parent 9955db636016e7f18358f7b5d24a14b55df4dabf

Merge "SearchFeatureProvider's context field is removed"

res/xml/display_settings.xml

diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index b5e2848..1440c3f 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -36,7 +36,7 @@
                 android:key="night_display"
                 android:title="@string/night_display_title"
                 android:fragment="com.android.settings.display.NightDisplaySettings"
-                android:widgetLayout="@null"
+                settings:widgetLayout="@null"
                 settings:keywords="@string/keywords_display_night_display" />
 
         <!-- Hide night mode for now

res/xml/ia_display_settings.xml

diff --git a/res/xml/ia_display_settings.xml b/res/xml/ia_display_settings.xml
index 756d551..946466b 100644
--- a/res/xml/ia_display_settings.xml
+++ b/res/xml/ia_display_settings.xml
@@ -40,7 +40,7 @@
             android:key="night_display"
             android:title="@string/night_display_title"
             android:fragment="com.android.settings.display.NightDisplaySettings"
-            android:widgetLayout="@null"
+            settings:widgetLayout="@null"
             settings:keywords="@string/keywords_display_night_display" />
 
         <com.android.settings.TimeoutListPreference