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

Commit a699ed59 authored by Charles Wang's avatar Charles Wang
Browse files

Fixing trimmed button text issue 

Screenshots at http://shortn/_CDfDuV4thn

Test: Manual (screenshots using pixel 6, foldable, tablet)
Bug: b/285028172
Change-Id: I95967898475efd3207c4b1bc16820797796a131f
parent 6bf2d136

core/res/res/layout/autofill_fill_dialog.xml

+10 −7
Original line number Diff line number Diff line
@@ -85,14 +85,18 @@ 
        android:layout_marginStart="24dp"

        android:layout_marginEnd="24dp"

        android:theme="@style/Theme.DeviceDefault.AutofillHalfScreenDialogButton"

        android:orientation="horizontal">

        android:orientation="horizontal"

        android:gravity="center_vertical">



        <Button

            android:id="@+id/autofill_dialog_no"

            android:layout_width="wrap_content"

            android:layout_height="36dp"

            android:layout_marginTop="6dp"

            android:layout_marginBottom="6dp"

            android:layout_height="40dp"

            android:paddingStart="12dp"

            android:paddingEnd="12dp"

            android:paddingTop="0dp"

            android:paddingBottom="0dp"

            android:minWidth="0dp"

            style="?android:attr/borderlessButtonStyle"

            android:text="@string/autofill_save_no">

        </Button>
@@ -107,9 +111,8 @@ 
        <Button

            android:id="@+id/autofill_dialog_yes"

            android:layout_width="wrap_content"

            android:layout_height="36dp"

            android:layout_marginTop="6dp"

            android:layout_marginBottom="6dp"

            android:layout_height="40dp"

            android:minWidth="0dp"

            style="@style/AutofillHalfSheetTonalButton"

            android:text="@string/autofill_save_yes"

            android:visibility="gone" >

core/res/res/layout/autofill_save.xml

+10 −7
Original line number Diff line number Diff line
@@ -72,14 +72,18 @@ 
            android:layout_marginTop="32dp"

            android:layout_marginBottom="18dp"

            android:theme="@style/Theme.DeviceDefault.AutofillHalfScreenDialogButton"

            android:orientation="horizontal">

            android:orientation="horizontal"

            android:gravity="center_vertical">



            <Button

                android:id="@+id/autofill_save_no"

                android:layout_width="wrap_content"

                android:layout_height="36dp"

                android:layout_marginTop="6dp"

                android:layout_marginBottom="6dp"

                android:layout_height="40dp"

                android:paddingStart="12dp"

                android:paddingEnd="12dp"

                android:paddingTop="0dp"

                android:paddingBottom="0dp"

                android:minWidth="0dp"

                style="?android:attr/borderlessButtonStyle"

                android:text="@string/autofill_save_no">

            </Button>
@@ -94,9 +98,8 @@ 
            <Button

                android:id="@+id/autofill_save_yes"

                android:layout_width="wrap_content"

                android:layout_height="36dp"

                android:layout_marginTop="6dp"

                android:layout_marginBottom="6dp"

                android:layout_height="40dp"

                android:minWidth="0dp"

                style="@style/AutofillHalfSheetTonalButton"

                android:text="@string/autofill_save_yes">

            </Button>

core/res/res/values/styles.xml

+2 −6
Original line number Diff line number Diff line
@@ -1500,12 +1500,8 @@ please see styles_device_defaults.xml. 
        <item name="fontFamily">google-sans-text-medium</item>

        <item name="textStyle">normal</item>

        <item name="textAllCaps">false</item>

        <item name="layout_marginTop">6dp</item>

        <item name="layout_marginBottom">6dp</item>

        <item name="paddingStart">16dp</item>

        <item name="paddingEnd">16dp</item>

        <item name="paddingTop">8dp</item>

        <item name="paddingBottom">8dp</item>

        <item name="paddingStart">24dp</item>

        <item name="paddingEnd">24dp</item>

    </style>

    <!-- @hide Tonal button for Autofill half screen dialog -->

    <style name="AutofillHalfSheetTonalButton" parent="AutofillHalfSheetButton">