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

Commit a694f285 authored by Wenbo Jie (介文博)'s avatar Wenbo Jie (介文博) Committed by Android (Google) Code Review
Browse files

Merge "[DocsUI M3] More dialog restyling" into main

parents af7c936e 8e3074b1
Loading
Loading
Loading
Loading
+3 −4
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:paddingTop="24dp"
    android:paddingStart="24dp"
    android:paddingEnd="24dp"
    android:textAppearance="@style/Subhead" />
    android:paddingTop="@dimen/dialog_content_padding_top"
    android:paddingBottom="@dimen/dialog_content_padding_bottom"
    android:paddingHorizontal="@dimen/dialog_content_padding_horizontal" />
+4 −3
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@
-->

<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:fitsSystemWindows="true">
@@ -24,10 +25,10 @@
        android:orientation="vertical"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
        android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
        android:layout_marginHorizontal="@dimen/dialog_content_padding_horizontal"
        android:layout_marginTop="@dimen/dialog_content_padding_top"
        android:layout_marginBottom="@dimen/dialog_content_padding_bottom">
        android:layout_marginBottom="@dimen/dialog_content_padding_bottom"
        app:boxBackgroundColor="?attr/colorSurfaceContainerHighest">

        <com.google.android.material.textfield.TextInputEditText
            android:id="@android:id/text1"
+3 −2
Original line number Diff line number Diff line
@@ -205,8 +205,9 @@
    <dimen name="layout_padding_bottom">@dimen/space_small_1</dimen>
    <dimen name="layout_padding_end">@dimen/space_small_1</dimen>

    <dimen name="dialog_content_padding_top">18dp</dimen>
    <dimen name="dialog_content_padding_bottom">24dp</dimen>
    <dimen name="dialog_content_padding_horizontal">@dimen/space_small_4</dimen>
    <dimen name="dialog_content_padding_top">@dimen/space_small_1</dimen>
    <dimen name="dialog_content_padding_bottom">@dimen/space_small_4</dimen>

    <dimen name="apps_row_title_height">48dp</dimen>
    <dimen name="apps_row_title_padding_start">24dp</dimen>
+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@
        <item name="android:textAppearance">@style/MaterialButtonTextAppearance</item>
    </style>

    <style name="MaterialAlertDialogTheme" parent="@style/ThemeOverlay.Material3.MaterialAlertDialog.Centered">
    <style name="MaterialAlertDialogTheme" parent="@style/ThemeOverlay.Material3.MaterialAlertDialog">
        <item name="buttonBarPositiveButtonStyle">@style/DialogFilledButton</item>
        <item name="buttonBarNegativeButtonStyle">@style/MaterialOutlinedButton</item>
        <item name="buttonBarNeutralButtonStyle">@style/DialogTextButton</item>
+2 −2
Original line number Diff line number Diff line
@@ -168,8 +168,8 @@
        <item name="fontFamily">@string/config_fontFamilyMedium</item>
    </style>

    <style name="MaterialAlertDialogTitleStyle" parent="@style/MaterialAlertDialog.Material3.Title.Text.CenterStacked">
        <item name="fontFamily">@string/config_fontFamilyMedium</item>
    <style name="MaterialAlertDialogTitleStyle" parent="@style/MaterialAlertDialog.Material3.Title.Text">
        <item name="fontFamily">@string/config_fontFamily</item>
    </style>

    <style name="MaterialAlertDialogBodyStyle" parent="@style/MaterialAlertDialog.Material3.Body.Text">
Loading