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

Commit 97a09493 authored by Gustav Sennton's avatar Gustav Sennton Committed by Android (Google) Code Review
Browse files

Merge "Use a fixed size for smart actions icons."

parents 711ef9f4 c726f47c
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -881,6 +881,7 @@
    <dimen name="smart_reply_button_stroke_width">1dp</dimen>
    <dimen name="smart_reply_button_font_size">14sp</dimen>
    <dimen name="smart_reply_button_line_spacing_extra">6sp</dimen> <!-- Total line height 20sp. -->
    <dimen name="smart_action_button_icon_size">24dp</dimen>
    <dimen name="smart_action_button_icon_padding">10dp</dimen>

    <!-- A reasonable upper bound for the height of the smart reply button. The measuring code
+3 −25
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.text.TextPaint;
import android.text.method.TransformationMethod;
import android.util.AttributeSet;
import android.util.Log;
import android.util.Size;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -282,9 +281,9 @@ public class SmartReplyView extends ViewGroup {

        Drawable iconDrawable = action.getIcon().loadDrawable(context);
        // Add the action icon to the Smart Action button.
        Size newIconSize = calculateIconSizeFromSingleLineButton(context, root,
                new Size(iconDrawable.getIntrinsicWidth(), iconDrawable.getIntrinsicHeight()));
        iconDrawable.setBounds(0, 0, newIconSize.getWidth(), newIconSize.getHeight());
        int newIconSize = context.getResources().getDimensionPixelSize(
                R.dimen.smart_action_button_icon_size);
        iconDrawable.setBounds(0, 0, newIconSize, newIconSize);
        button.setCompoundDrawables(iconDrawable, null, null, null);

        button.setOnClickListener(view ->
@@ -298,27 +297,6 @@ public class SmartReplyView extends ViewGroup {
        return button;
    }

    private static Size calculateIconSizeFromSingleLineButton(Context context, ViewGroup root,
            Size originalIconSize) {
        Button button = (Button) LayoutInflater.from(context).inflate(
                R.layout.smart_action_button, root, false);
        // Add simple text here to ensure the button displays one line of text.
        button.setText("a");
        return calculateIconSizeFromButtonHeight(button, originalIconSize);
    }

    // Given a button with text on a single line - we want to add an icon to that button. This
    // method calculates the icon height to use to avoid making the button grow in height.
    private static Size calculateIconSizeFromButtonHeight(Button button, Size originalIconSize) {
        // A completely permissive measure spec should make the button text single-line.
        button.measure(MEASURE_SPEC_ANY_LENGTH, MEASURE_SPEC_ANY_LENGTH);
        int buttonHeight = button.getMeasuredHeight();
        int newIconHeight = buttonHeight / 2;
        int newIconWidth = (int) (originalIconSize.getWidth()
                * ((double) newIconHeight) / originalIconSize.getHeight());
        return new Size(newIconWidth, newIconHeight);
    }

    @Override
    public LayoutParams generateLayoutParams(AttributeSet attrs) {
        return new LayoutParams(mContext, attrs);