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

Commit dd9a8017 authored by Selim Cinek's avatar Selim Cinek Committed by Android (Google) Code Review
Browse files

Merge "Fixed a bug where the dozemode was incorrectly applied" into nyc-dev

parents f1c63715 0934bd99

packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java

+8 −2
Original line number Diff line number Diff line
@@ -523,7 +523,13 @@ public class NotificationContentView extends FrameLayout { 
    }



    public void setDark(boolean dark, boolean fade, long delay) {

        if (mDark == dark || mContractedChild == null) return;

        setDark(dark, fade, delay, false /* force */);

    }



    public void setDark(boolean dark, boolean fade, long delay, boolean force) {

        if ((!force && mDark == dark) || mContractedChild == null) {

            return;

        }

        mDark = dark;

        dark = dark && !mShowingLegacyBackground;

        if (mVisibleType == VISIBLE_TYPE_CONTRACTED || !dark) {
@@ -571,7 +577,6 @@ public class NotificationContentView extends FrameLayout { 
        selectLayout(false /* animate */, true /* force */);

        if (mContractedChild != null) {

            mContractedWrapper.notifyContentUpdated(entry.notification);

            mContractedWrapper.setDark(mDark, false /* animate */, 0 /* delay */);

        }

        if (mExpandedChild != null) {

            mExpandedWrapper.notifyContentUpdated(entry.notification);
@@ -579,6 +584,7 @@ public class NotificationContentView extends FrameLayout { 
        if (mHeadsUpChild != null) {

            mHeadsUpWrapper.notifyContentUpdated(entry.notification);

        }

        setDark(mDark, false /* animate */, 0 /* delay */, true /* force */);

    }



    private void updateSingleLineView() {