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

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

Merge "[DocsUI M3] Restyle dialog buttons" into main

parents 3c43eff8 38cd1e4e

res/flag(com.android.documentsui.flags.use_material3)/values/styles.xml

+8 −11
Original line number Diff line number Diff line
@@ -87,10 +87,6 @@ 
        <item name="android:overlapAnchor">false</item>

    </style>



    <style name="MaterialAlertDialogTitleStyle" parent="@style/MaterialAlertDialog.Material3.Title.Text.CenterStacked">

        <item name="fontFamily">@string/config_fontFamilyMedium</item>

    </style>



    <style name="MaterialButton" parent="@style/Widget.Material3.Button.UnelevatedButton">

        <item name="android:textAppearance">@style/MaterialButtonTextAppearance</item>

    </style>
@@ -103,6 +99,10 @@ 
        <item name="android:textAppearance">@style/MaterialButtonTextAppearance</item>

    </style>



    <style name="DialogFilledButton" parent="@style/MaterialButton">

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

    </style>



    <style name="DialogTextButton" parent="@style/Widget.Material3.Button.TextButton.Dialog">

        <item name="android:textAppearance">@style/MaterialButtonTextAppearance</item>

    </style>
@@ -111,15 +111,12 @@ 
        <item name="android:textAppearance">@style/EmptyStateButtonTextAppearance</item>

    </style>



    <style name="AlertDialogTheme" parent="@style/ThemeOverlay.AppCompat.Dialog.Alert">

        <item name="buttonBarPositiveButtonStyle">@style/DialogTextButton</item>

        <item name="buttonBarNegativeButtonStyle">@style/DialogTextButton</item>

    </style>



    <style name="MaterialAlertDialogTheme" parent="@style/ThemeOverlay.Material3.MaterialAlertDialog.Centered">

        <item name="buttonBarPositiveButtonStyle">@style/DialogTextButton</item>

        <item name="buttonBarNegativeButtonStyle">@style/DialogTextButton</item>

        <item name="buttonBarPositiveButtonStyle">@style/DialogFilledButton</item>

        <item name="buttonBarNegativeButtonStyle">@style/MaterialOutlinedButton</item>

        <item name="buttonBarNeutralButtonStyle">@style/DialogTextButton</item>

        <item name="materialAlertDialogTitleTextStyle">@style/MaterialAlertDialogTitleStyle</item>

        <item name="materialAlertDialogBodyTextStyle">@style/MaterialAlertDialogBodyStyle</item>

    </style>



    <style name="SearchChipItemStyle" parent="@style/Widget.Material3.Chip.Filter">

res/flag(com.android.documentsui.flags.use_material3)/values/styles_text.xml

+8 −0
Original line number Diff line number Diff line
@@ -163,4 +163,12 @@ 
        <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>



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

        <item name="fontFamily">@string/config_fontFamily</item>

    </style>



</resources>

res/flag(com.android.documentsui.flags.use_material3)/values/themes.xml

+0 −1
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ 
        <item name="toolbarNavigationButtonStyle">@style/HamburgerMenuButtonStyle</item>

        <item name="actionModeStyle">@style/ActionModeStyle</item>

        <item name="actionOverflowButtonStyle">@style/OverflowButtonStyle</item>

        <item name="alertDialogTheme">@style/AlertDialogTheme</item>

        <item name="autoCompleteTextViewStyle">@style/AutoCompleteTextViewStyle</item>

        <item name="bottomSheetDialogTheme">@style/BottomSheetDialogStyle</item>

        <item name="materialCardViewStyle">@style/CardViewStyle</item>