| commit | 1f977b0e8c5cc9f78f22835ed2d1ecb3e5597bbc | [log] [tgz] |
|---|---|---|
| author | Victor Truong <truongvi@google.com> | Tue Apr 12 16:06:13 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 12 16:06:13 2022 +0000 |
| tree | e12c2e1757df7af5f3f23b7ecb4f488ddb888267 | |
| parent | 89e58480d36eccb88893b154f4da8f7fa05b74e2 [diff] | |
| parent | cd11aa887aaa62c0d05f65bc5a37dd537dad6bdd [diff] |
Disable dream highlight when screensaver is disabled in Settings. am: cd11aa887a Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17712388 Change-Id: I4b14a6811de245ab6f44f650e7d9ce71d20f6fc0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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; + } }
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);