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

Commit cbf658e4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix initialization of SmartReplyView button colors"

parents 4ed8d163 905ad551

packages/SystemUI/src/com/android/systemui/statusbar/policy/SmartReplyView.java

+4 −4
Original line number Original line Diff line number Diff line
@@ -102,8 +102,7 @@ public class SmartReplyView extends ViewGroup { 
        mHeightUpperLimit = NotificationUtils.getFontScaledHeight(mContext,

        mHeightUpperLimit = NotificationUtils.getFontScaledHeight(mContext,

            R.dimen.smart_reply_button_max_height);

            R.dimen.smart_reply_button_max_height);





        mCurrentBackgroundColor = context.getColor(R.color.smart_reply_button_background);

        mDefaultBackgroundColor = context.getColor(R.color.smart_reply_button_background);

        mDefaultBackgroundColor = mCurrentBackgroundColor;

        mDefaultTextColor = mContext.getColor(R.color.smart_reply_button_text);

        mDefaultTextColor = mContext.getColor(R.color.smart_reply_button_text);

        mDefaultTextColorDarkBg = mContext.getColor(R.color.smart_reply_button_text_dark_bg);

        mDefaultTextColorDarkBg = mContext.getColor(R.color.smart_reply_button_text_dark_bg);

        mDefaultStrokeColor = mContext.getColor(R.color.smart_reply_button_stroke);

        mDefaultStrokeColor = mContext.getColor(R.color.smart_reply_button_stroke);
@@ -142,8 +141,9 @@ public class SmartReplyView extends ViewGroup { 
        mSingleToDoubleLineButtonWidthIncrease =

        mSingleToDoubleLineButtonWidthIncrease =

                2 * (doubleLineButtonPaddingHorizontal - singleLineButtonPaddingHorizontal);

                2 * (doubleLineButtonPaddingHorizontal - singleLineButtonPaddingHorizontal);







        mBreakIterator = BreakIterator.getLineInstance();

        mBreakIterator = BreakIterator.getLineInstance();



        setBackgroundTintColor(mDefaultBackgroundColor);

        reallocateCandidateButtonQueueForSqueezing();

        reallocateCandidateButtonQueueForSqueezing();

    }

    }
@@ -182,7 +182,7 @@ public class SmartReplyView extends ViewGroup { 
    public void resetSmartSuggestions(View newSmartReplyContainer) {

    public void resetSmartSuggestions(View newSmartReplyContainer) {

        mSmartReplyContainer = newSmartReplyContainer;

        mSmartReplyContainer = newSmartReplyContainer;

        removeAllViews();

        removeAllViews();

        mCurrentBackgroundColor = mDefaultBackgroundColor;

        setBackgroundTintColor(mDefaultBackgroundColor);

    }

    }





    /** Add buttons to the {@link SmartReplyView} */

    /** Add buttons to the {@link SmartReplyView} */