commit 45dccd14f3db01915c057a4810b7056e29cc95b0
author Julia Reynolds <juliacr@google.com> Tue Apr 12 17:39:55 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 12 17:39:55 2022 +0000
tree df67cf1d6275aa441bd4cd8c0e12442fd75872cc
parent 1a35538f726a6239f2265042ecd07449e0b3cd5b
parent 9987091312ca05d8b30ce9de31e73f0fe36fda84

Merge changes from topic "presubmit-am-1e7fa8f458a24c9bb07a3501870823fc"

* changes:
  [automerge] Fix some history issues 2p: 4d46dddbe7 2p: cf0c8f9868
  [automerge] Fix some history issues 2p: 4d46dddbe7
  Fix some history issues

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);