commit cd11aa887aaa62c0d05f65bc5a37dd537dad6bdd
author Victor Truong <truongvi@google.com> Mon Apr 11 22:49:24 2022 +0000
committer Victor Truong <truongvi@google.com> Tue Apr 12 13:23:10 2022 +0000
tree f88e70c5d6776ef8a5478d0ce8d07650ab4dee98
parent 7a5ade7e9f7565a7ddadb3ffb5a7abe1c05f3253

Disable dream highlight when screensaver is disabled in Settings.

Bug: 228329639
Test: Manual
Change-Id: Ic6d9664cc800c28327fbcaa1628bb518c07354f2

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

diff --git a/src/com/android/settings/dream/DreamAdapter.java b/src/com/android/settings/dream/DreamAdapter.java
index 8494088..c595c09 100644
--- a/src/com/android/settings/dream/DreamAdapter.java
+++ b/src/com/android/settings/dream/DreamAdapter.java
@@ -177,4 +177,11 @@
             notifyDataSetChanged();
         }
     }
+
+    /**
+     * Gets the enabled state of all items.
+     */
+    public boolean getEnabled() {
+        return mEnabled;
+    }
 }

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

diff --git a/src/com/android/settings/dream/DreamPickerController.java b/src/com/android/settings/dream/DreamPickerController.java
index c638a97..20d8aeb 100644
--- a/src/com/android/settings/dream/DreamPickerController.java
+++ b/src/com/android/settings/dream/DreamPickerController.java
@@ -158,7 +158,7 @@
 
         @Override
         public boolean isActive() {
-            if (mActiveDream == null) {
+            if (!mAdapter.getEnabled() || mActiveDream == null) {
                 return false;
             }
             return mDreamInfo.componentName.equals(mActiveDream.componentName);