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

Commit 761b2d03 authored by Steve Elliott's avatar Steve Elliott Committed by Automerger Merge Worker
Browse files

Merge changes Ib280f943,Ic2dd0479 into udc-dev am: e8c1aeaa am: 1c6b1120 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22572253



Change-Id: I14cf2a952b7be718df9bbb5e765f282209ff4858
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 98470160 1c6b1120

packages/SystemUI/res/layout/smart_action_button.xml

+2 −2
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ 
        android:textSize="@dimen/smart_reply_button_font_size"

        android:lineSpacingExtra="@dimen/smart_reply_button_line_spacing_extra"

        android:textColor="@color/smart_reply_button_text"

        android:paddingLeft="@dimen/smart_reply_button_action_padding_left"

        android:paddingRight="@dimen/smart_reply_button_padding_horizontal"

        android:paddingStart="@dimen/smart_reply_button_action_padding_left"

        android:paddingEnd="@dimen/smart_reply_button_padding_horizontal"

        android:drawablePadding="@dimen/smart_action_button_icon_padding"

        android:textStyle="normal"

        android:ellipsize="none"/>

packages/SystemUI/res/layout/smart_reply_button.xml

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
        android:textSize="@dimen/smart_reply_button_font_size"

        android:lineSpacingExtra="@dimen/smart_reply_button_line_spacing_extra"

        android:textColor="@color/smart_reply_button_text"

        android:paddingLeft="@dimen/smart_reply_button_padding_horizontal"

        android:paddingRight="@dimen/smart_reply_button_padding_horizontal"

        android:paddingStart="@dimen/smart_reply_button_padding_horizontal"

        android:paddingEnd="@dimen/smart_reply_button_padding_horizontal"

        android:textStyle="normal"

        android:ellipsize="none"/>

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentInflater.java

+1 −1
Original line number Diff line number Diff line
@@ -966,7 +966,7 @@ public class NotificationContentInflater implements NotificationRowContentBinder 


            @Override

            public ApplicationInfo getApplicationInfo() {

                ApplicationInfo applicationInfo = super.getApplicationInfo();

                ApplicationInfo applicationInfo = new ApplicationInfo(super.getApplicationInfo());

                applicationInfo.flags |= ApplicationInfo.FLAG_SUPPORTS_RTL;

                return applicationInfo;

            }

packages/SystemUI/src/com/android/systemui/statusbar/policy/SmartReplyStateInflater.kt

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ interface SmartActionInflater { 
                            setBounds(0, 0, newIconSize, newIconSize)

                        }

                // Add the action icon to the Smart Action button.

                setCompoundDrawables(iconDrawable, null, null, null)

                setCompoundDrawablesRelative(iconDrawable, null, null, null)



                val onClickListener = View.OnClickListener {

                    onSmartActionClick(entry, smartActions, actionIndex, action)

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

+9 −9
Original line number Diff line number Diff line
@@ -588,15 +588,15 @@ public class SmartReplyView extends ViewGroup { 
    }



    /**

     * Returns the combined width of the left drawable (the action icon) and the padding between the

     * drawable and the button text.

     * Returns the combined width of the start drawable (the action icon) and the padding between

     * the drawable and the button text.

     */

    private int getLeftCompoundDrawableWidthWithPadding(Button button) {

        Drawable[] drawables = button.getCompoundDrawables();

        Drawable leftDrawable = drawables[0];

        if (leftDrawable == null) return 0;

    private int getStartCompoundDrawableWidthWithPadding(Button button) {

        Drawable[] drawables = button.getCompoundDrawablesRelative();

        Drawable startDrawable = drawables[0];

        if (startDrawable == null) return 0;



        return leftDrawable.getBounds().width() + button.getCompoundDrawablePadding();

        return startDrawable.getBounds().width() + button.getCompoundDrawablePadding();

    }



    private int squeezeButtonToTextWidth(Button button, int heightMeasureSpec, int textWidth) {
@@ -605,8 +605,8 @@ public class SmartReplyView extends ViewGroup { 
        // Re-measure the squeezed smart reply button.

        clearLayoutLineCount(button);

        final int widthMeasureSpec = MeasureSpec.makeMeasureSpec(

                button.getPaddingLeft() + button.getPaddingRight() + textWidth

                      + getLeftCompoundDrawableWidthWithPadding(button), MeasureSpec.AT_MOST);

                button.getPaddingStart() + button.getPaddingEnd() + textWidth

                      + getStartCompoundDrawableWidthWithPadding(button), MeasureSpec.AT_MOST);

        button.measure(widthMeasureSpec, heightMeasureSpec);

        if (button.getLayout() == null) {

            Log.wtf(TAG, "Button layout is null after measure.");