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: I098d86efd92d1cf4db45360482aabb88be2380de Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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;
|
||||
}
|
||||
}
|
||||
|
@@ -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);
|
||||
|
Reference in New Issue
Block a user