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

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

Merge "[DocsUI M3] Use Material 3 Styles/TextAppearances" into main

parents bc05ccf7 11492b8f

res/flag(com.android.documentsui.flags.use_material3)/layout/dialog_file_name.xml

+1 −3
Original line number Diff line number Diff line
@@ -27,9 +27,7 @@ 
        android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"

        android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"

        android:layout_marginTop="@dimen/dialog_content_padding_top"

        android:layout_marginBottom="@dimen/dialog_content_padding_bottom"

        android:layout_centerInParent="true"

        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">

        android:layout_marginBottom="@dimen/dialog_content_padding_bottom">



        <com.google.android.material.textfield.TextInputEditText

            android:id="@android:id/text1"

res/flag(com.android.documentsui.flags.use_material3)/layout/fragment_save.xml

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 


        <com.google.android.material.button.MaterialButton

            android:id="@android:id/button1"

            style="@style/Widget.MaterialComponents.Button.UnelevatedButton"

            style="@style/Widget.Material3.Button.UnelevatedButton"

            app:cornerRadius="@dimen/button_corner_radius"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

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

+2 −8
Original line number Diff line number Diff line
@@ -16,19 +16,13 @@ 
  -->



<resources>

    <!--

    <style name="ActionBarTheme" parent="@style/ActionBarThemeCommon">

        <item name="android:actionMenuTextColor">@*android:color/accent_device_default_dark</item>

    </style>

    -->



    <style name="TabTextAppearance" parent="@android:style/TextAppearance.Material.Medium">

    <style name="TabTextAppearance" parent="@style/TextAppearance.Material3.TitleMedium">

        <item name="android:textSize">14sp</item>

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

        <item name="android:textColor">?android:attr/colorAccent</item>

    </style>



    <style name="EmptyStateButton" parent="@style/Widget.MaterialComponents.Button.OutlinedButton">

    <style name="EmptyStateButton" parent="@style/Widget.Material3.Button.OutlinedButton">

        <item name="android:backgroundTint">@android:color/transparent</item>

        <item name="android:textColor">@*android:color/system_neutral1_100</item>

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

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

+5 −13
Original line number Diff line number Diff line
@@ -16,34 +16,26 @@ 


<resources>



  <style name="SectionHeader" parent="@android:style/TextAppearance.Material.Medium">

  <style name="SectionHeader" parent="@style/TextAppearance.Material3.TitleMedium">

    <item name="android:textColor">?android:attr/textColorPrimary</item>

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

    <item name="android:textSize">12sp</item>

  </style>



  <!--

  <style name="ActionBarTheme" parent="@style/ActionBarThemeCommon">

    <item name="android:actionMenuTextColor">

      @*android:color/accent_device_default_light

    </item>

  </style>

  -->



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

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

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

    </item>

    <item name="android:backgroundTint">?android:colorAccent</item>

  </style>



  <style name="MaterialOutlinedButton" parent="@style/Widget.MaterialComponents.Button.OutlinedButton">

  <style name="MaterialOutlinedButton" parent="@style/Widget.Material3.Button.OutlinedButton">

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

    </item>

    <item name="android:backgroundTint">@android:color/white</item>

    <item name="android:textColor">?android:colorAccent</item>

  </style>



  <style name="EmptyStateButton" parent="@style/Widget.MaterialComponents.Button.OutlinedButton">

  <style name="EmptyStateButton" parent="@style/Widget.Material3.Button.OutlinedButton">

    <item name="android:backgroundTint">@android:color/transparent</item>

    <item name="android:textColor">@*android:color/system_neutral1_900</item>

    <item name="android:textAllCaps">false</item>
@@ -51,7 +43,7 @@ 
    </item>

  </style>



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

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

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

    </item>

    <item name="android:textColor">?android:attr/colorAccent</item>

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

+10 −10
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
        <item name="android:layout_margin">@dimen/search_bar_margin</item>

    </style>



    <style name="CardViewStyle" parent="@style/Widget.MaterialComponents.CardView">

    <style name="CardViewStyle" parent="@style/Widget.Material3.CardView.Outlined">

        <item name="cardBackgroundColor">@color/app_background_color</item>

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

        <item name="cardCornerRadius">@dimen/grid_item_radius</item>
@@ -58,7 +58,7 @@ 
        <item name="android:textAppearance">@style/AutoCompleteText</item>

    </style>



    <style name="BottomSheetDialogStyle" parent="@style/ThemeOverlay.MaterialComponents.BottomSheetDialog">

    <style name="BottomSheetDialogStyle" parent="@style/ThemeOverlay.Material3.BottomSheetDialog">

        <item name="android:windowIsFloating">false</item>

        <item name="bottomSheetStyle">@style/BottomSheet</item>

        <item name="colorControlHighlight">@color/ripple_material_light</item>
@@ -79,26 +79,26 @@ 
        <item name="android:overlapAnchor">false</item>

    </style>



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

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

        <item name="android:textColor">?attr/colorOnSurface</item>

        <item name="android:textSize">20sp</item>

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

    </style>



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

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

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

    </style>



    <style name="MaterialOutlinedButton" parent="@style/Widget.MaterialComponents.Button.OutlinedButton">

    <style name="MaterialOutlinedButton" parent="@style/Widget.Material3.Button.OutlinedButton">

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

    </style>



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

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

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

        <item name="android:textColor">?android:attr/colorAccent</item>

    </style>



    <style name="EmptyStateButton" parent="@style/Widget.MaterialComponents.Button.TextButton">

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

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

    </style>
@@ -107,12 +107,12 @@ 
        <item name="buttonBarNegativeButtonStyle">@style/DialogTextButton</item>

    </style>



    <style name="MaterialAlertDialogStyle" parent="@style/MaterialAlertDialog.MaterialComponents">

    <style name="MaterialAlertDialogStyle" parent="@style/MaterialAlertDialog.Material3">

        <item name="backgroundInsetTop">12dp</item>

        <item name="backgroundInsetBottom">12dp</item>

    </style>



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

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

        <item name="android:dialogCornerRadius">@dimen/grid_item_radius</item>

        <item name="alertDialogStyle">@style/MaterialAlertDialogStyle</item>

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