From cd11aa887aaa62c0d05f65bc5a37dd537dad6bdd Mon Sep 17 00:00:00 2001
From: Victor Truong <truongvi@google.com>
Date: Mon, 11 Apr 2022 22:49:24 +0000
Subject: [PATCH] Disable dream highlight when screensaver is disabled in
 Settings.

Bug: 228329639
Test: Manual
Change-Id: Ic6d9664cc800c28327fbcaa1628bb518c07354f2
---
 src/com/android/settings/dream/DreamAdapter.java          | 7 +++++++
 src/com/android/settings/dream/DreamPickerController.java | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/dream/DreamAdapter.java b/src/com/android/settings/dream/DreamAdapter.java
index 8494088ba12..c595c099286 100644
--- a/src/com/android/settings/dream/DreamAdapter.java
+++ b/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;
+    }
 }
diff --git a/src/com/android/settings/dream/DreamPickerController.java b/src/com/android/settings/dream/DreamPickerController.java
index c638a9784b2..20d8aeb46a4 100644
--- a/src/com/android/settings/dream/DreamPickerController.java
+++ b/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);