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

Commit 75e8f17d authored by Bill Lin's avatar Bill Lin
Browse files

SnackBar ActionButton do not apply correc TextColor 

The snackbar layout of support lib hardcode ThemeOverlay.AppCompat.Dark
support/design/snackbar/res/layout/design_layout_snackbar_include.xml
Only left the colorAccent to customize ActionButton text color

Solution: Override setActionTextColor() before Snackbar.show()

Bug: 113161033
Test: atest DocumentsUITests
      manual test

Change-Id: Iab0c822cba5b05c2895f4b17affd36db504d30e9
parent ccd17cc2

res/values/attrs.xml

+4 −0
Original line number Diff line number Diff line
@@ -27,4 +27,8 @@ 
        <attr name="textHandleColor" format="reference" />

        <attr name="textCursorColor" format="reference" />

    </declare-styleable>



    <declare-styleable name="SnackbarView">

        <attr name="android:textColor" format="reference" />

    </declare-styleable>

</resources>

res/values/styles.xml

+4 −0
Original line number Diff line number Diff line
@@ -58,4 +58,8 @@ 
        <item name="android:textSize">13sp</item>

        <item name="android:textColor">?android:attr/textColorSecondary</item>

    </style>



    <style name="SnackbarButtonStyle" parent="Widget.MaterialComponents.Button.TextButton">

        <item name="android:textColor">@color/g_light_grey</item>

    </style>

</resources>

src/com/android/documentsui/ui/Snackbars.java

+7 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ package com.android.documentsui.ui; 


import androidx.annotation.StringRes;

import android.app.Activity;

import android.content.res.TypedArray;

import android.graphics.Color;

import android.support.design.widget.Snackbar;

import android.view.Gravity;

import android.view.View;
@@ -101,8 +103,13 @@ public final class Snackbars { 
    public static final Snackbar makeSnackbarWithAction(Activity activity, int docCount,

            CharSequence message, int duration, CharSequence actionText,

            Consumer<View> action, final Snackbar.Callback callback) {

        TypedArray ta = activity.obtainStyledAttributes(R.style.SnackbarButtonStyle,

                R.styleable.SnackbarView);

        int textColor = ta.getColor(R.styleable.SnackbarView_android_textColor, Color.WHITE);

        ta.recycle();

        return makeSnackbar(activity, message, duration)

                .setAction(actionText, action::accept)

                .setActionTextColor(textColor)

                .addCallback(callback);

    }