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

Commit fee4305f authored by Edgar Wang's avatar Edgar Wang Committed by Android (Google) Code Review
Browse files

Merge "[Expressive] Update styling of NLS dialog" into main

parents 9e997e30 1df1ca25

res/layout/enable_nls_dialog_content.xml

+10 −2
Original line number Diff line number Diff line
@@ -155,12 +155,20 @@ 
            <Button

                android:id="@+id/allow_button"

                android:text="@string/accessibility_dialog_button_allow"

                style="@style/AccessibilityDialogButton" />

                style="@style/AccessibilityDialogButton"

                android:background="@drawable/settingslib_expressive_button_background_filled"

                android:textColor="@color/settingslib_materialColorOnPrimary"/>



            <Space

                android:layout_height="8dp"

                android:layout_width="0dp"/>



            <Button

                android:id="@+id/deny_button"

                android:text="@string/accessibility_dialog_button_deny"

                style="@style/AccessibilityDialogButton" />

                style="@style/AccessibilityDialogButton"

                android:background="@drawable/settingslib_expressive_button_background_outline"

                android:textColor="@color/settingslib_materialColorPrimary"/>

        </LinearLayout>

    </LinearLayout>

res/values/styles.xml

+4 −3
Original line number Diff line number Diff line
@@ -739,7 +739,6 @@ 
        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">wrap_content</item>

        <item name="android:orientation">vertical</item>

        <item name="android:divider">@*android:drawable/list_divider_material</item>

        <item name="android:showDividers">middle</item>

    </style>
@@ -811,16 +810,18 @@ 
        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">wrap_content</item>

        <item name="android:orientation">vertical</item>

        <item name="android:divider">@*android:drawable/list_divider_material</item>

        <item name="android:showDividers">middle</item>

        <item name="android:paddingBottom">24dp</item>

    </style>



    <style name="AccessibilityDialogButton"

           parent="@*android:style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog">

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">56dp</item>

        <item name="android:layout_height">48dp</item>

        <item name="android:paddingEnd">8dp</item>

        <item name="android:paddingStart">8dp</item>

        <item name="android:textAppearance">@style/TextAppearance.SettingsLib.LabelLarge</item>

        <item name="android:layout_marginHorizontal">24dp</item>

        <item name="android:background">?android:attr/selectableItemBackground</item>

    </style>