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

Commit dad13577 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Update dark mode on notifications when content is updated" into lmp-mr1-dev

parents 221b545c 394a5d68

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

+3 −0
Original line number Diff line number Diff line
@@ -244,6 +244,9 @@ public class NotificationContentView extends FrameLayout { 


    public void notifyContentUpdated() {

        selectLayout(false /* animate */, true /* force */);

        if (mContractedChild != null) {

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

        }

    }



    public boolean isContentExpandable() {

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

+4 −8
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import com.android.systemui.statusbar.phone.NotificationPanelView; 
public class NotificationCustomViewWrapper extends NotificationViewWrapper {



    private final ViewInvertHelper mInvertHelper;

    private boolean mDark;



    protected NotificationCustomViewWrapper(View view) {

        super(view);
@@ -36,8 +35,6 @@ public class NotificationCustomViewWrapper extends NotificationViewWrapper { 


    @Override

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

        if (mDark != dark) {

            mDark = dark;

        if (fade) {

            mInvertHelper.fade(dark, delay);

        } else {
@@ -45,4 +42,3 @@ public class NotificationCustomViewWrapper extends NotificationViewWrapper { 
        }

    }

}
 
}

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

+2 −7
Original line number Diff line number Diff line
@@ -24,19 +24,14 @@ import android.view.View; 
 */

public class NotificationMediaViewWrapper extends NotificationTemplateViewWrapper {



    private boolean mDark;



    protected NotificationMediaViewWrapper(Context ctx, View view) {

        super(ctx, view);

    }



    @Override

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

        if (mDark != dark) {

            mDark = dark;



        // Only update the large icon, because the rest is already inverted.

        setPictureGrayscale(dark, fade, delay);

    }

}
 
}

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

+14 −19
Original line number Diff line number Diff line
@@ -51,8 +51,6 @@ public class NotificationTemplateViewWrapper extends NotificationViewWrapper { 
    private final int mIconBackgroundDarkColor;

    private final Interpolator mLinearOutSlowInInterpolator;



    private boolean mDark;



    protected NotificationTemplateViewWrapper(Context ctx, View view) {

        super(view);

        mIconDarkAlpha = ctx.getResources().getInteger(R.integer.doze_small_icon_alpha);
@@ -95,8 +93,6 @@ public class NotificationTemplateViewWrapper extends NotificationViewWrapper { 


    @Override

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

        if (mDark != dark) {

            mDark = dark;

        if (mInvertHelper != null) {

            if (fade) {

                mInvertHelper.fade(dark, delay);
@@ -115,7 +111,6 @@ public class NotificationTemplateViewWrapper extends NotificationViewWrapper { 
        }

        setPictureGrayscale(dark, fade, delay);

    }

    }



    protected void setPictureGrayscale(boolean grayscale, boolean fade, long delay) {

        if (mPicture != null) {