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

Commit b904a2e6 authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Change color of expand button on notif groups 

They should use the tertiary accent color.

Fixes: 183454454
Test: visual
Change-Id: Ieb1fdfb15a9b74c77880ae7bfad19549e23f9396
parent 358a76f7

core/java/android/app/Notification.java

+20 −2
Original line number Diff line number Diff line
@@ -5354,8 +5354,7 @@ public class Notification implements Parcelable 
            contentView.setInt(R.id.expand_button, "setDefaultPillColor", pillColor);

            // Use different highlighted colors except when low-priority mode prevents that

            if (!p.mReduceHighlights) {

                textColor = getBackgroundColor(p);

                pillColor = getAccentColor(p);

                pillColor = getAccentTertiaryColor(p);

            }

            contentView.setInt(R.id.expand_button, "setHighlightTextColor", textColor);

            contentView.setInt(R.id.expand_button, "setHighlightPillColor", pillColor);
@@ -6299,6 +6298,25 @@ public class Notification implements Parcelable 
            return ColorUtils.blendARGB(getPrimaryTextColor(p), getBackgroundColor(p), 0.8f);

        }



        /**

         * Gets the tertiary accent color for colored UI elements. If we're tinting with the theme

         * accent, this comes from the tertiary system accent palette, otherwise this would be

         * identical to {@link #getSmallIconColor(StandardTemplateParams)}.

         */

        private @ColorInt int getAccentTertiaryColor(StandardTemplateParams p) {

            if (isColorized(p)) {

                return getPrimaryTextColor(p);

            }

            if (mTintWithThemeAccent) {

                int color = obtainThemeColor(com.android.internal.R.attr.colorAccentTertiary,

                        COLOR_INVALID);

                if (color != COLOR_INVALID) {

                    return color;

                }

            }

            return getContrastColor(p);

        }



        /**

         * Gets the theme's error color, or the primary text color for colorized notifications.

         */