Disable dream highlight when screensaver is disabled in Settings. am: cd11aa887a am: 9475c3d575

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17712388

Change-Id: I93c4c904c82be8f9caa2c8e278bc8d3bf561594e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/settings/dream/DreamAdapter.java

@@ -177,4 +177,11 @@ public class DreamAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
             notifyDataSetChanged();
         }
     }
+
+    /**
+     * Gets the enabled state of all items.
+     */
+    public boolean getEnabled() {
+        return mEnabled;
+    }
 }

src/com/android/settings/dream/DreamPickerController.java

@@ -158,7 +158,7 @@ public class DreamPickerController extends BasePreferenceController implements
 
         @Override
         public boolean isActive() {
-            if (mActiveDream == null) {
+            if (!mAdapter.getEnabled() || mActiveDream == null) {
                 return false;
             }
             return mDreamInfo.componentName.equals(mActiveDream.componentName);