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

Commit 587cb82a authored by Jeff DeCew's avatar Jeff DeCew Committed by Android (Google) Code Review
Browse files

Merge "Move footer logic to a separate flag." into main

parents dd217853 4dd5e07b

packages/SystemUI/aconfig/systemui.aconfig

+10 −1
Original line number Diff line number Diff line
@@ -204,7 +204,16 @@ flag { 
    description: "Re-enable the codepath that removed tinting of notifications when the"

        " standard background color is desired.  This was the behavior before we discovered"

        " a resources threading issue, which we worked around by tinting the notification"

        " backgrounds and footer buttons."

        " backgrounds."

    bug: "294830092"

}



flag {

    name: "notification_footer_background_tint_optimization"

    namespace: "systemui"

    description: "Remove duplicative tinting of notification footer buttons. This was the behavior"

        " before we discovered a resources threading issue, which we worked around by applying the"

        " same color as a tint to the background drawable of footer buttons."

    bug: "294830092"

}

packages/SystemUI/src/com/android/systemui/statusbar/notification/footer/ui/view/FooterView.java

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package com.android.systemui.statusbar.notification.footer.ui.view; 


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



import static com.android.systemui.Flags.notificationBackgroundTintOptimization;

import static com.android.systemui.Flags.notificationFooterBackgroundTintOptimization;

import static com.android.systemui.util.ColorUtilKt.hexColorString;



import android.annotation.ColorInt;
@@ -407,7 +407,7 @@ public class FooterView extends StackScrollerDecorView { 
        final Drawable clearAllBg = theme.getDrawable(R.drawable.notif_footer_btn_background);

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

        final @ColorInt int scHigh;

        if (!notificationBackgroundTintOptimization()) {

        if (!notificationFooterBackgroundTintOptimization()) {

            scHigh = Utils.getColorAttrDefaultColor(mContext,

                    com.android.internal.R.attr.materialColorSurfaceContainerHigh);

            if (scHigh != 0) {