Disable dream highlight when screensaver is disabled in Settings. am: cd11aa887a am: 1f977b0e8c

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17712388

Change-Id: I6f6a255a1a9c195e324e0934b44440954025831a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Victor Truong
2022-04-12 16:26:34 +00:00
committed by Automerger Merge Worker
2 changed files with 8 additions and 1 deletions

View File

@@ -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;
}
}

View File

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