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

Commit 6999e378 authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Merge "Add redundant tint to notification and footer button backgrounds." into... 

Merge "Add redundant tint to notification and footer button backgrounds." into udc-dev am: 43439de6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23214856



Change-Id: Ia7b1238815015dfaaf0442fdcfbb8ff398ebbb72
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ff921596 43439de6

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java

+2 −1
Original line number Diff line number Diff line
@@ -321,7 +321,8 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView 
    protected void setBackgroundTintColor(int color) {

        if (color != mCurrentBackgroundTint) {

            mCurrentBackgroundTint = color;

            if (color == mNormalColor) {

            // TODO(282173943): re-enable this tinting optimization when Resources are thread-safe

            if (false && color == mNormalColor) {

                // We don't need to tint a normal notification

                color = 0;

            }

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/FooterView.java

+17 −3
Original line number Diff line number Diff line
@@ -16,11 +16,15 @@ 


package com.android.systemui.statusbar.notification.row;



import static android.graphics.PorterDuff.Mode.SRC_ATOP;



import android.annotation.ColorInt;

import android.content.Context;

import android.content.res.ColorStateList;

import android.content.res.Configuration;

import android.content.res.Resources;

import android.graphics.ColorFilter;

import android.graphics.PorterDuffColorFilter;

import android.graphics.drawable.Drawable;

import android.util.AttributeSet;

import android.util.IndentingPrintWriter;
@@ -157,10 +161,20 @@ public class FooterView extends StackScrollerDecorView { 
     */

    public void updateColors() {

        Resources.Theme theme = mContext.getTheme();

        int textColor = getResources().getColor(R.color.notif_pill_text, theme);

        mClearAllButton.setBackground(theme.getDrawable(R.drawable.notif_footer_btn_background));

        final @ColorInt int textColor = getResources().getColor(R.color.notif_pill_text, theme);

        final Drawable clearAllBg = theme.getDrawable(R.drawable.notif_footer_btn_background);

        final Drawable manageBg = theme.getDrawable(R.drawable.notif_footer_btn_background);

        // TODO(b/282173943): Remove redundant tinting once Resources are thread-safe

        final @ColorInt int buttonBgColor =

                Utils.getColorAttrDefaultColor(mContext, com.android.internal.R.attr.colorSurface);

        final ColorFilter bgColorFilter = new PorterDuffColorFilter(buttonBgColor, SRC_ATOP);

        if (buttonBgColor != 0) {

            clearAllBg.setColorFilter(bgColorFilter);

            manageBg.setColorFilter(bgColorFilter);

        }

        mClearAllButton.setBackground(clearAllBg);

        mClearAllButton.setTextColor(textColor);

        mManageButton.setBackground(theme.getDrawable(R.drawable.notif_footer_btn_background));

        mManageButton.setBackground(manageBg);

        mManageButton.setTextColor(textColor);

        final @ColorInt int labelTextColor =

                Utils.getColorAttrDefaultColor(mContext, android.R.attr.textColorPrimary);