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