1 files changed, 19 insertions, 5 deletions
diff --git a/Settings/src/com/android/tv/settings/device/display/daydream/DaydreamFragment.java b/Settings/src/com/android/tv/settings/device/display/daydream/DaydreamFragment.java
index 45318c894..e4f3493ff 100644
--- a/Settings/src/com/android/tv/settings/device/display/daydream/DaydreamFragment.java
+++ b/Settings/src/com/android/tv/settings/device/display/daydream/DaydreamFragment.java
@@ -18,10 +18,10 @@ package com.android.tv.settings.device.display.daydream;
 
 import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
 
-import static com.android.tv.settings.library.overlay.FlavorUtils.FLAVOR_CLASSIC;
-import static com.android.tv.settings.library.overlay.FlavorUtils.FLAVOR_TWO_PANEL;
-import static com.android.tv.settings.library.overlay.FlavorUtils.FLAVOR_VENDOR;
-import static com.android.tv.settings.library.overlay.FlavorUtils.FLAVOR_X;
+import static com.android.tv.settings.overlay.FlavorUtils.FLAVOR_CLASSIC;
+import static com.android.tv.settings.overlay.FlavorUtils.FLAVOR_TWO_PANEL;
+import static com.android.tv.settings.overlay.FlavorUtils.FLAVOR_VENDOR;
+import static com.android.tv.settings.overlay.FlavorUtils.FLAVOR_X;
 import static com.android.tv.settings.util.InstrumentationUtils.logEntrySelected;
 
 import android.app.tvsettings.TvSettingsEnums;
@@ -45,7 +45,9 @@ import com.android.settingslib.dream.DreamBackend;
 import com.android.tv.settings.R;
 import com.android.tv.settings.RestrictedPreferenceAdapter;
 import com.android.tv.settings.SettingsPreferenceFragment;
-import com.android.tv.settings.library.overlay.FlavorUtils;
+import com.android.tv.settings.library.util.SliceUtils;
+import com.android.tv.settings.overlay.FlavorUtils;
+import com.android.tv.twopanelsettings.slices.SlicePreference;
 
 import java.util.List;
 import java.util.Map;
@@ -63,6 +65,7 @@ public class DaydreamFragment extends SettingsPreferenceFragment
     private static final String KEY_ACTIVE_DREAM = "activeDream";
     private static final String KEY_DREAM_TIME = "dreamTime";
     private static final String KEY_DREAM_NOW = "dreamNow";
+    private static final String KEY_AMBIENT_SETTINGS = "ambient_settings";
 
     private static final String DREAM_COMPONENT_NONE = "NONE";
     private static final String PACKAGE_SCHEME = "package";
@@ -144,6 +147,8 @@ public class DaydreamFragment extends SettingsPreferenceFragment
 
         final Preference dreamNowPref = findPreference(KEY_DREAM_NOW);
         dreamNowPref.setEnabled(mBackend.isEnabled());
+
+        updateAmbientSettings();
     }
 
     private void refreshActiveDreamPref() {
@@ -282,6 +287,15 @@ public class DaydreamFragment extends SettingsPreferenceFragment
         }
     }
 
+    private void updateAmbientSettings() {
+        final SlicePreference ambientSlicePref = findPreference(KEY_AMBIENT_SETTINGS);
+        if (ambientSlicePref != null) {
+            if (SliceUtils.isSliceProviderValid(getContext(), ambientSlicePref.getUri())) {
+                ambientSlicePref.setVisible(true);
+            }
+        }
+    }
+
     @Override
     protected int getPageId() {
         return TvSettingsEnums.PREFERENCES_SCREENSAVER;