Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f977b0e authored by Victor Truong's avatar Victor Truong Committed by Automerger Merge Worker
Browse files

Disable dream highlight when screensaver is disabled in Settings. am: cd11aa88 

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



Change-Id: I4b14a6811de245ab6f44f650e7d9ce71d20f6fc0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 89e58480 cd11aa88

src/com/android/settings/dream/DreamAdapter.java

+7 −0
Original line number Diff line number Diff line
@@ -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;

    }

}

src/com/android/settings/dream/DreamPickerController.java

+1 −1
Original line number Diff line number Diff line
@@ -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);