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

6 files changed, 33 insertions, 49 deletions

diff --git a/res/flag(com.android.documentsui.flags.use_material3)/layout/dialog_file_name.xml b/res/flag(com.android.documentsui.flags.use_material3)/layout/dialog_file_name.xml
index 12b8e98b7..8cae6ac03 100644
--- a/res/flag(com.android.documentsui.flags.use_material3)/layout/dialog_file_name.xml
+++ b/res/flag(com.android.documentsui.flags.use_material3)/layout/dialog_file_name.xml
@@ -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"
diff --git a/res/flag(com.android.documentsui.flags.use_material3)/layout/fragment_save.xml b/res/flag(com.android.documentsui.flags.use_material3)/layout/fragment_save.xml
index 53b64472a..401eaec88 100644
--- a/res/flag(com.android.documentsui.flags.use_material3)/layout/fragment_save.xml
+++ b/res/flag(com.android.documentsui.flags.use_material3)/layout/fragment_save.xml
@@ -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"
diff --git a/res/flag(com.android.documentsui.flags.use_material3)/values-night-v31/styles.xml b/res/flag(com.android.documentsui.flags.use_material3)/values-night-v31/styles.xml
index 55fb6da02..23fcdfaf0 100644
--- a/res/flag(com.android.documentsui.flags.use_material3)/values-night-v31/styles.xml
+++ b/res/flag(com.android.documentsui.flags.use_material3)/values-night-v31/styles.xml
@@ -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>
diff --git a/res/flag(com.android.documentsui.flags.use_material3)/values-v31/styles.xml b/res/flag(com.android.documentsui.flags.use_material3)/values-v31/styles.xml
index 7938dad70..5be3cd9dc 100644
--- a/res/flag(com.android.documentsui.flags.use_material3)/values-v31/styles.xml
+++ b/res/flag(com.android.documentsui.flags.use_material3)/values-v31/styles.xml
@@ -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>
diff --git a/res/flag(com.android.documentsui.flags.use_material3)/values/styles.xml b/res/flag(com.android.documentsui.flags.use_material3)/values/styles.xml
index 1e48d98ad..d9398db2d 100644
--- a/res/flag(com.android.documentsui.flags.use_material3)/values/styles.xml
+++ b/res/flag(com.android.documentsui.flags.use_material3)/values/styles.xml
@@ -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>
diff --git a/res/flag(com.android.documentsui.flags.use_material3)/values/styles_text.xml b/res/flag(com.android.documentsui.flags.use_material3)/values/styles_text.xml
index 9323c7c29..fd493a9eb 100644
--- a/res/flag(com.android.documentsui.flags.use_material3)/values/styles_text.xml
+++ b/res/flag(com.android.documentsui.flags.use_material3)/values/styles_text.xml
@@ -14,12 +14,12 @@
      limitations under the License.
 -->
 <resources>
-    <style name="SortTitle" parent="@style/TextAppearance.MaterialComponents.Headline6">
+    <style name="SortTitle" parent="@style/TextAppearance.Material3.TitleLarge">
         <item name="android:textColor">?android:attr/textColorPrimary</item>
         <item name="android:textSize">11sp</item>
     </style>
 
-    <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="android:textAllCaps">true</item>
         <item name="fontFamily">@string/config_fontFamilyMedium</item>
@@ -67,39 +67,39 @@
         <item name="android:textSize">@dimen/action_mode_text_size</item>
     </style>
 
-    <style name="ToolbarTitle" parent="@android:style/TextAppearance.Material.Title">
+    <style name="ToolbarTitle" parent="@style/TextAppearance.Material3.TitleLarge">
         <item name="fontFamily">@string/config_fontFamilyMedium</item>
     </style>
 
-    <style name="DrawerMenuTitle" parent="@android:style/TextAppearance.Material.Title">
+    <style name="DrawerMenuTitle" parent="@style/TextAppearance.Material3.TitleLarge">
         <item name="android:textSize">24sp</item>
         <item name="fontFamily">@string/config_fontFamilyMedium</item>
     </style>
 
-    <style name="DrawerMenuHeader" parent="@android:style/TextAppearance.Material.Subhead">
+    <style name="DrawerMenuHeader" parent="@style/TextAppearance.Material3.BodyLarge">
         <item name="android:textColor">?android:attr/textColorSecondary</item>
         <item name="android:textAllCaps">true</item>
         <item name="android:textSize">11sp</item>
         <item name="fontFamily">@string/config_fontFamilyMedium</item>
     </style>
 
-    <style name="DrawerMenuPrimary" parent="android:style/TextAppearance.Material.Body2">
+    <style name="DrawerMenuPrimary" parent="@style/TextAppearance.Material3.BodyMedium">
         <item name="android:textSize">14sp</item>
         <item name="android:textColor">@color/item_root_primary_text</item>
         <item name="fontFamily">@string/config_fontFamilyMedium</item>
     </style>
 
-    <style name="DrawerMenuSecondary" parent="android:style/TextAppearance.Material.Body2">
+    <style name="DrawerMenuSecondary" parent="@style/TextAppearance.Material3.BodyMedium">
         <item name="android:textSize">12sp</item>
         <item name="android:textColor">@color/item_root_secondary_text</item>
         <item name="fontFamily">@string/config_fontFamily</item>
     </style>
 
-    <style name="InspectorKeySubTitle" parent="@style/TextAppearance.MaterialComponents.Subtitle1">
+    <style name="InspectorKeySubTitle" parent="@style/TextAppearance.Material3.TitleMedium">
         <item name="android:textColor">?android:attr/textColorSecondary</item>
     </style>
 
-    <style name="MaterialButtonTextAppearance" parent="@style/TextAppearance.MaterialComponents.Button">
+    <style name="MaterialButtonTextAppearance" parent="@style/TextAppearance.Material3.LabelLarge">
         <item name="android:textAllCaps">@bool/config_button_all_caps</item>
         <item name="fontFamily">@string/config_fontFamilyMedium</item>
     </style>
@@ -127,26 +127,26 @@
         <item name="fontFamily">@string/config_fontFamilyMedium</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>
     </style>
 
-    <style name="ItemCaptionText" parent="@android:style/TextAppearance.Material.Caption">
+    <style name="ItemCaptionText" parent="@style/TextAppearance.Material3.BodySmall">
         <item name="android:textColor">@color/doc_list_item_subtitle_color</item>
         <item name="fontFamily">@string/config_fontFamily</item>
     </style>
 
-    <style name="MenuItemTextAppearance" parent="@android:style/TextAppearance.Material.Body2">
+    <style name="MenuItemTextAppearance" parent="@style/TextAppearance.Material3.BodyMedium">
         <item name="android:textSize">14sp</item>
         <item name="fontFamily">@string/config_fontFamily</item>
     </style>
 
-    <style name="Subhead" parent="@android:style/TextAppearance.Material.Subhead">
+    <style name="Subhead" parent="@style/TextAppearance.Material3.BodyLarge">
         <item name="fontFamily">@string/config_fontFamily</item>
     </style>
 
-    <style name="Body1" parent="@android:style/TextAppearance.Material.Body1">
+    <style name="Body1" parent="@style/TextAppearance.Material3.BodyMedium">
         <item name="fontFamily">@string/config_fontFamily</item>
     </style>