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>
This commit is contained in:
@@ -177,4 +177,11 @@ public class DreamAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
|
|||||||
notifyDataSetChanged();
|
notifyDataSetChanged();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the enabled state of all items.
|
||||||
|
*/
|
||||||
|
public boolean getEnabled() {
|
||||||
|
return mEnabled;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -158,7 +158,7 @@ public class DreamPickerController extends BasePreferenceController implements
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isActive() {
|
public boolean isActive() {
|
||||||
if (mActiveDream == null) {
|
if (!mAdapter.getEnabled() || mActiveDream == null) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return mDreamInfo.componentName.equals(mActiveDream.componentName);
|
return mDreamInfo.componentName.equals(mActiveDream.componentName);
|
||||||
|
Reference in New Issue
Block a user