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

Commit 9b393b45 authored by Yining Liu's avatar Yining Liu Committed by Automerger Merge Worker
Browse files

Merge "Fix text clipping of EmphasizedNotificationButton, when the system font... 

Merge "Fix text clipping of EmphasizedNotificationButton, when the system font size is at maximum" into udc-dev am: 8f1476e7 am: eaa387ce

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



Change-Id: I584977e102ac0447aa8fca75f0e6e41f818a8f64
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cc53ac7a eaa387ce

core/java/com/android/internal/widget/NotificationActionListLayout.java

+3 −1
Original line number Diff line number Diff line
@@ -361,13 +361,15 @@ public class NotificationActionListLayout extends LinearLayout { 
            // same padding on bottom and at end

            int paddingBottom = getResources().getDimensionPixelSize(

                    com.android.internal.R.dimen.notification_content_margin_end);

            height = mEmphasizedHeight;

            int buttonPaddingInternal = getResources().getDimensionPixelSize(

                    com.android.internal.R.dimen.button_inset_vertical_material);

            setPaddingRelative(getPaddingStart(),

                    paddingTop - buttonPaddingInternal,

                    getPaddingEnd(),

                    paddingBottom - buttonPaddingInternal);



            setMinimumHeight(mEmphasizedHeight);

            height = ViewGroup.LayoutParams.WRAP_CONTENT;

        } else {

            setPaddingRelative(getPaddingStart(),

                    mDefaultPaddingTop,

core/res/res/layout/notification_material_action_emphasized.xml

+2 −1
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ 
    style="@style/NotificationEmphasizedAction"

    android:id="@+id/action0"

    android:layout_width="wrap_content"

    android:layout_height="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="@dimen/notification_action_emphasized_height"

    android:layout_marginStart="12dp"

    android:drawablePadding="6dp"

    android:gravity="center"

core/res/res/layout/notification_material_action_emphasized_tombstone.xml

+2 −1
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ 
    style="@style/NotificationEmphasizedAction"

    android:id="@+id/action0"

    android:layout_width="wrap_content"

    android:layout_height="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="@dimen/notification_action_emphasized_height"

    android:layout_marginStart="12dp"

    android:drawablePadding="6dp"

    android:enabled="false"