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

Commit 13871b69 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12695596 from f96979b4 to 25Q1-release 

Change-Id: I6ffba90bdb360b9debd80f4e1d1126523dd32920
parents 36bfbf8b f96979b4

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

+0 −30
Original line number Diff line number Diff line
@@ -77,36 +77,6 @@ 
        <item name="android:itemTextAppearance">@style/MenuItemTextAppearance</item>

    </style>



    <!-- Theme used for Material 3 uplift, hidden behind the use_material3 flag. -->

    <style name="DocumentsDefaultM3Theme" parent="@style/Theme.Material3.DynamicColors.DayNight.NoActionBar">



        <!-- This only used by support lib, not allow to overlay -->

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

        <item name="windowActionModeOverlay">true</item>



        <!-- For material design widget, chips, buttons, not support attr-->

        <item name="colorPrimary">@color/primary</item>

        <item name="colorAccent">@color/primary</item>



        <!-- TODO need to solve the error handle in GridItemThumbnail -->

        <item name="gridItemTint">@color/item_doc_grid_tint</item>



        <item name="actionBarTheme">@style/ActionBarTheme</item>

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

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

        <item name="actionOverflowMenuStyle">@style/OverflowMenuStyle</item>

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

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

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

        <item name="materialButtonStyle">@style/MaterialButton</item>

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

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

        <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>

        <item name="queryBackground">@color/menu_search_background</item>

        <item name="snackbarButtonStyle">@style/SnackbarButtonStyle</item>

        <item name="android:itemTextAppearance">@style/MenuItemTextAppearance</item>

    </style>



    <style name="TabTheme" parent="@android:style/Theme.DeviceDefault.DayNight">

        <item name="colorPrimary">@color/edge_effect</item>

    </style>

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>