From 3414226881e685272e52e8ac70a3952a6f0f8b05 Mon Sep 17 00:00:00 2001
From: pubiqq <serj.ese@gmail.com>
Date: Tue, 28 Jan 2025 22:55:48 +0300
Subject: [PATCH] [Internal] Update naming of base styles

---
 .../bottomsheet/res/values/themes_base.xml    | 16 ++-----
 .../dialog/res/values-v24/themes_base.xml     | 28 -----------
 .../dialog/res/values/themes_base.xml         | 46 +++++++------------
 .../dialog/res/values/themes_base_bridge.xml  | 23 ++++------
 .../dialog/res/values/themes_overlay.xml      | 14 ++----
 .../sidesheet/res/values/themes_base.xml      | 16 ++-----
 .../material/textfield/res/values/styles.xml  |  9 ++--
 .../theme/res/values-v24/themes_base.xml      | 28 -----------
 .../material/theme/res/values/themes_base.xml | 46 +++++++------------
 .../theme/res/values/themes_base_bridge.xml   | 27 ++++-------
 10 files changed, 64 insertions(+), 189 deletions(-)
 delete mode 100644 lib/java/com/google/android/material/dialog/res/values-v24/themes_base.xml
 delete mode 100644 lib/java/com/google/android/material/theme/res/values-v24/themes_base.xml

diff --git a/lib/java/com/google/android/material/bottomsheet/res/values/themes_base.xml b/lib/java/com/google/android/material/bottomsheet/res/values/themes_base.xml
index 15b0ab0e75c..bfd5e408bd4 100644
--- a/lib/java/com/google/android/material/bottomsheet/res/values/themes_base.xml
+++ b/lib/java/com/google/android/material/bottomsheet/res/values/themes_base.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
 -->
 <resources>
-  <style name="Base.V14.Theme.Material3.Light.BottomSheetDialog" parent="Theme.Material3.Light.Dialog">
+  <style name="Base.Theme.Material3.Light.BottomSheetDialog" parent="Theme.Material3.Light.Dialog">
     <item name="android:windowIsFloating">false</item>
     <item name="android:windowSoftInputMode">adjustResize</item>
     <item name="android:windowBackground">@android:color/transparent</item>
@@ -23,7 +23,7 @@
     <item name="bottomSheetStyle">@style/Widget.Material3.BottomSheet.Modal</item>
   </style>
 
-  <style name="Base.V14.Theme.Material3.Dark.BottomSheetDialog" parent="Theme.Material3.Dark.Dialog">
+  <style name="Base.Theme.Material3.Dark.BottomSheetDialog" parent="Theme.Material3.Dark.Dialog">
     <item name="android:windowIsFloating">false</item>
     <item name="android:windowSoftInputMode">adjustResize</item>
     <item name="android:windowBackground">@android:color/transparent</item>
@@ -31,7 +31,8 @@
     <item name="bottomSheetStyle">@style/Widget.Material3.BottomSheet.Modal</item>
   </style>
 
-  <style name="Base.V14.ThemeOverlay.Material3.BottomSheetDialog" parent="Base.ThemeOverlay.Material3.Dialog">
+  <style name="Base.ThemeOverlay.Material3.BottomSheetDialog" parent="Base.ThemeOverlay.Material3.Dialog">
+    <item name="android:statusBarColor">@android:color/transparent</item>
     <item name="android:windowIsFloating">false</item>
     <item name="android:windowSoftInputMode">adjustResize</item>
     <item name="android:windowBackground">@android:color/transparent</item>
@@ -39,13 +40,4 @@
     <item name="bottomSheetStyle">@style/Widget.Material3.BottomSheet.Modal</item>
     <item name="enableEdgeToEdge">true</item>
   </style>
-
-  <style name="Base.V21.ThemeOverlay.Material3.BottomSheetDialog"
-    parent="Base.V14.ThemeOverlay.Material3.BottomSheetDialog">
-    <item name="android:statusBarColor">@android:color/transparent</item>
-  </style>
-
-  <style name="Base.Theme.Material3.Light.BottomSheetDialog" parent="Base.V14.Theme.Material3.Light.BottomSheetDialog"/>
-  <style name="Base.Theme.Material3.Dark.BottomSheetDialog" parent="Base.V14.Theme.Material3.Dark.BottomSheetDialog"/>
-  <style name="Base.ThemeOverlay.Material3.BottomSheetDialog" parent="Base.V21.ThemeOverlay.Material3.BottomSheetDialog"/>
 </resources>
diff --git a/lib/java/com/google/android/material/dialog/res/values-v24/themes_base.xml b/lib/java/com/google/android/material/dialog/res/values-v24/themes_base.xml
deleted file mode 100644
index bb8657382a5..00000000000
--- a/lib/java/com/google/android/material/dialog/res/values-v24/themes_base.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2021 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
--->
-<resources>
-  <style name="Base.V24.Theme.Material3.Light.Dialog" parent="Base.V14.Theme.Material3.Light.Dialog">
-    <item name="android:contextPopupMenuStyle">@style/Widget.Material3.PopupMenu.ContextMenu</item>
-  </style>
-
-  <style name="Base.V24.Theme.Material3.Dark.Dialog" parent="Base.V14.Theme.Material3.Dark.Dialog">
-    <item name="android:contextPopupMenuStyle">@style/Widget.Material3.PopupMenu.ContextMenu</item>
-  </style>
-
-  <style name="Base.Theme.Material3.Light.Dialog" parent="Base.V24.Theme.Material3.Light.Dialog"/>
-  <style name="Base.Theme.Material3.Dark.Dialog" parent="Base.V24.Theme.Material3.Dark.Dialog"/>
-</resources>
diff --git a/lib/java/com/google/android/material/dialog/res/values/themes_base.xml b/lib/java/com/google/android/material/dialog/res/values/themes_base.xml
index 073c08c575f..30d5f3481b3 100644
--- a/lib/java/com/google/android/material/dialog/res/values/themes_base.xml
+++ b/lib/java/com/google/android/material/dialog/res/values/themes_base.xml
@@ -16,9 +16,6 @@
 -->
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-  <!-- All new attributes should be set in the follow four Base.V14 themes. -->
-  <eat-comment/>
-
   <!-- Base themes of Theme.Material3Expressive themes for dialogs. -->
 
   <style name="Base.Theme.Material3Expressive.Light.Dialog" parent="Theme.Material3.Light.Dialog">
@@ -160,7 +157,7 @@
 
   <!-- Base themes of Theme.Material3 themes for dialogs. -->
 
-  <style name="Base.V14.Theme.Material3.Light.Dialog" parent="Theme.MaterialComponents.Light.Dialog">
+  <style name="Base.Theme.Material3.Light.Dialog" parent="Theme.MaterialComponents.Light.Dialog">
     <item name="isMaterial3Theme">true</item>
 
     <!-- Color palettes -->
@@ -249,6 +246,7 @@
     <item name="collapsingToolbarLayoutStyle">@style/Widget.Material3.CollapsingToolbar</item>
     <item name="collapsingToolbarLayoutMediumStyle">@style/Widget.Material3.CollapsingToolbar.Medium</item>
     <item name="collapsingToolbarLayoutLargeStyle">@style/Widget.Material3.CollapsingToolbar.Large</item>
+    <item name="android:contextPopupMenuStyle" tools:targetApi="n">@style/Widget.Material3.PopupMenu.ContextMenu</item>
     <item name="dockedToolbarStyle">@style/Widget.Material3.DockedToolbar</item>
     <item name="dockedToolbarVibrantStyle">@style/Widget.Material3.DockedToolbar.Vibrant</item>
     <item name="drawerLayoutStyle">@style/Widget.Material3.DrawerLayout</item>
@@ -480,7 +478,7 @@
     <item name="dynamicColorThemeOverlay">@style/ThemeOverlay.Material3.DynamicColors.Light</item>
   </style>
 
-  <style name="Base.V14.Theme.Material3.Dark.Dialog" parent="Theme.MaterialComponents.Dialog">
+  <style name="Base.Theme.Material3.Dark.Dialog" parent="Theme.MaterialComponents.Dialog">
     <item name="isMaterial3Theme">true</item>
 
     <!-- Color palettes -->
@@ -569,6 +567,7 @@
     <item name="collapsingToolbarLayoutStyle">@style/Widget.Material3.CollapsingToolbar</item>
     <item name="collapsingToolbarLayoutMediumStyle">@style/Widget.Material3.CollapsingToolbar.Medium</item>
     <item name="collapsingToolbarLayoutLargeStyle">@style/Widget.Material3.CollapsingToolbar.Large</item>
+    <item name="android:contextPopupMenuStyle" tools:targetApi="n">@style/Widget.Material3.PopupMenu.ContextMenu</item>
     <item name="dockedToolbarStyle">@style/Widget.Material3.DockedToolbar</item>
     <item name="dockedToolbarVibrantStyle">@style/Widget.Material3.DockedToolbar.Vibrant</item>
     <item name="drawerLayoutStyle">@style/Widget.Material3.DrawerLayout</item>
@@ -800,9 +799,6 @@
     <item name="dynamicColorThemeOverlay">@style/ThemeOverlay.Material3.DynamicColors.Dark</item>
   </style>
 
-  <style name="Base.Theme.Material3.Light.Dialog" parent="Base.V14.Theme.Material3.Light.Dialog"/>
-  <style name="Base.Theme.Material3.Dark.Dialog" parent="Base.V14.Theme.Material3.Dark.Dialog"/>
-
   <style name="Base.Theme.Material3.Light.Dialog.FixedSize">
     <item name="windowFixedWidthMajor">@dimen/abc_dialog_fixed_width_major</item>
     <item name="windowFixedWidthMinor">@dimen/abc_dialog_fixed_width_minor</item>
@@ -817,7 +813,15 @@
     <item name="windowFixedHeightMinor">@dimen/abc_dialog_fixed_height_minor</item>
   </style>
 
-  <style name="Base.V14.Theme.MaterialComponents.Dialog" parent="Base.V14.Theme.MaterialComponents.Dialog.Bridge">
+  <!-- Themes in the "Base.Theme" family vary based on the current platform
+       version to provide the correct basis on each device. You probably don't
+       want to use them directly in your apps.
+
+       Themes in the "Theme.MaterialComponents" family are meant to be extended or used
+       directly by apps. -->
+  <eat-comment/>
+
+  <style name="Base.Theme.MaterialComponents.Dialog" parent="Base.Theme.MaterialComponents.Dialog.Bridge">
     <item name="viewInflaterClass">com.google.android.material.theme.MaterialComponentsViewInflater</item>
 
     <item name="colorPrimary">@color/design_dark_default_color_primary</item>
@@ -863,6 +867,7 @@
     <item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar</item>
 
     <item name="alertDialogTheme">@style/ThemeOverlay.MaterialComponents.Dialog.Alert</item>
+    <item name="android:alertDialogTheme">@style/ThemeOverlay.MaterialComponents.Dialog.Alert.Framework</item>
     <item name="materialAlertDialogTheme">@style/ThemeOverlay.MaterialComponents.MaterialAlertDialog</item>
 
     <!-- Type styles -->
@@ -870,11 +875,7 @@
     <item name="textAppearanceSmallPopupMenu">?attr/textAppearanceSubtitle1</item>
   </style>
 
-  <style name="Base.V21.Theme.MaterialComponents.Dialog" parent="Base.V14.Theme.MaterialComponents.Dialog">
-    <item name="android:alertDialogTheme">@style/ThemeOverlay.MaterialComponents.Dialog.Alert.Framework</item>
-  </style>
-
-  <style name="Base.V14.Theme.MaterialComponents.Light.Dialog" parent="Base.V14.Theme.MaterialComponents.Light.Dialog.Bridge">
+  <style name="Base.Theme.MaterialComponents.Light.Dialog" parent="Base.Theme.MaterialComponents.Light.Dialog.Bridge">
     <item name="viewInflaterClass">com.google.android.material.theme.MaterialComponentsViewInflater</item>
 
     <!-- Colors -->
@@ -920,6 +921,7 @@
     <item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar</item>
 
     <item name="alertDialogTheme">@style/ThemeOverlay.MaterialComponents.Dialog.Alert</item>
+    <item name="android:alertDialogTheme">@style/ThemeOverlay.MaterialComponents.Light.Dialog.Alert.Framework</item>
     <item name="materialAlertDialogTheme">@style/ThemeOverlay.MaterialComponents.MaterialAlertDialog</item>
 
     <!-- Type styles -->
@@ -927,22 +929,6 @@
     <item name="textAppearanceSmallPopupMenu">?attr/textAppearanceSubtitle1</item>
   </style>
 
-  <style name="Base.V21.Theme.MaterialComponents.Light.Dialog" parent="Base.V14.Theme.MaterialComponents.Light.Dialog">
-    <item name="android:alertDialogTheme">@style/ThemeOverlay.MaterialComponents.Light.Dialog.Alert.Framework</item>
-  </style>
-
-  <!-- Themes in the "Base.Theme" family vary based on the current platform
-       version to provide the correct basis on each device. You probably don't
-       want to use them directly in your apps.
-
-       Themes in the "Theme.MaterialComponents" family are meant to be extended or used
-       directly by apps. -->
-  <eat-comment/>
-
-  <style name="Base.Theme.MaterialComponents.Dialog" parent="Base.V21.Theme.MaterialComponents.Dialog"/>
-
-  <style name="Base.Theme.MaterialComponents.Light.Dialog" parent="Base.V21.Theme.MaterialComponents.Light.Dialog"/>
-
   <style name="Base.Theme.MaterialComponents.Dialog.Alert">
     <item name="android:windowMinWidthMajor">@dimen/abc_dialog_min_width_major</item>
     <item name="android:windowMinWidthMinor">@dimen/abc_dialog_min_width_minor</item>
diff --git a/lib/java/com/google/android/material/dialog/res/values/themes_base_bridge.xml b/lib/java/com/google/android/material/dialog/res/values/themes_base_bridge.xml
index 0d3420134cb..98403e31975 100644
--- a/lib/java/com/google/android/material/dialog/res/values/themes_base_bridge.xml
+++ b/lib/java/com/google/android/material/dialog/res/values/themes_base_bridge.xml
@@ -27,10 +27,15 @@
 
   <style name="Platform.MaterialComponents.Light.Dialog" parent="Theme.AppCompat.Light.Dialog"/>
 
-  <!-- All new attributes should be set in the following four Base.V14 themes. -->
+  <!-- Themes in the "Base.Theme" family vary based on the current platform
+       version to provide the correct basis on each device. You probably don't
+       want to use them directly in your apps.
+
+       Themes in the "Theme.MaterialComponents" family are meant to be extended or used
+       directly by apps. -->
   <eat-comment/>
 
-  <style name="Base.V14.Theme.MaterialComponents.Dialog.Bridge" parent="Platform.MaterialComponents.Dialog">
+  <style name="Base.Theme.MaterialComponents.Dialog.Bridge" parent="Platform.MaterialComponents.Dialog">
     <item name="isMaterialTheme">true</item>
 
     <item name="colorPrimaryVariant">@color/design_dark_default_color_primary_variant</item>
@@ -113,7 +118,7 @@
     <item name="elevationOverlayColor">?attr/colorOnSurface</item>
   </style>
 
-  <style name="Base.V14.Theme.MaterialComponents.Light.Dialog.Bridge" parent="Platform.MaterialComponents.Light.Dialog">
+  <style name="Base.Theme.MaterialComponents.Light.Dialog.Bridge" parent="Platform.MaterialComponents.Light.Dialog">
     <item name="isMaterialTheme">true</item>
 
     <item name="colorPrimaryVariant">@color/design_default_color_primary_variant</item>
@@ -196,16 +201,4 @@
     <item name="elevationOverlayColor">?attr/colorOnSurface</item>
   </style>
 
-  <!-- Themes in the "Base.Theme" family vary based on the current platform
-       version to provide the correct basis on each device. You probably don't
-       want to use them directly in your apps.
-
-       Themes in the "Theme.MaterialComponents" family are meant to be extended or used
-       directly by apps. -->
-  <eat-comment/>
-
-  <style name="Base.Theme.MaterialComponents.Dialog.Bridge" parent="Base.V14.Theme.MaterialComponents.Dialog.Bridge"/>
-
-  <style name="Base.Theme.MaterialComponents.Light.Dialog.Bridge" parent="Base.V14.Theme.MaterialComponents.Light.Dialog.Bridge"/>
-
 </resources>
diff --git a/lib/java/com/google/android/material/dialog/res/values/themes_overlay.xml b/lib/java/com/google/android/material/dialog/res/values/themes_overlay.xml
index 69ca268501e..3e5a6edbb5b 100644
--- a/lib/java/com/google/android/material/dialog/res/values/themes_overlay.xml
+++ b/lib/java/com/google/android/material/dialog/res/values/themes_overlay.xml
@@ -128,17 +128,18 @@
 
   <!-- Dialog theme overlays for M2. -->
 
-  <style name="Base.V14.ThemeOverlay.MaterialComponents.Dialog" parent="ThemeOverlay.AppCompat.Dialog">
+  <style name="Base.ThemeOverlay.MaterialComponents.Dialog" parent="ThemeOverlay.AppCompat.Dialog">
+    <item name="android:windowBackground">@drawable/mtrl_dialog_background</item>
     <!-- Widget styles -->
     <item name="materialButtonStyle">@style/Widget.MaterialComponents.Button.TextButton.Dialog.Flush</item>
   </style>
 
-  <style name="Base.V14.ThemeOverlay.MaterialComponents.Dialog.Alert" parent="ThemeOverlay.AppCompat.Dialog.Alert">
+  <style name="Base.ThemeOverlay.MaterialComponents.Dialog.Alert" parent="ThemeOverlay.AppCompat.Dialog.Alert">
     <!-- Widget styles -->
     <item name="buttonBarButtonStyle">@style/Widget.MaterialComponents.Button.TextButton.Dialog.Flush</item>
   </style>
 
-  <style name="Base.V14.ThemeOverlay.MaterialComponents.MaterialAlertDialog" parent="ThemeOverlay.AppCompat.Dialog.Alert">
+  <style name="Base.ThemeOverlay.MaterialComponents.MaterialAlertDialog" parent="ThemeOverlay.AppCompat.Dialog.Alert">
     <!-- Widget styles -->
     <item name="materialAlertDialogButtonSpacerVisibility">@integer/mtrl_view_invisible</item>
     <item name="alertDialogStyle">@style/MaterialAlertDialog.MaterialComponents</item>
@@ -152,13 +153,6 @@
     <item name="materialAlertDialogBodyTextStyle">@style/MaterialAlertDialog.MaterialComponents.Body.Text</item>
   </style>
 
-  <style name="Base.ThemeOverlay.MaterialComponents.Dialog" parent="Base.V14.ThemeOverlay.MaterialComponents.Dialog">
-    <item name="android:windowBackground">@drawable/mtrl_dialog_background</item>
-  </style>
-
-  <style name="Base.ThemeOverlay.MaterialComponents.Dialog.Alert" parent="Base.V14.ThemeOverlay.MaterialComponents.Dialog.Alert"/>
-  <style name="Base.ThemeOverlay.MaterialComponents.MaterialAlertDialog" parent="Base.V14.ThemeOverlay.MaterialComponents.MaterialAlertDialog"/>
-
   <!--
     MaterialComponents ThemeOverlays for Framework Alert Dialogs.
   -->
diff --git a/lib/java/com/google/android/material/sidesheet/res/values/themes_base.xml b/lib/java/com/google/android/material/sidesheet/res/values/themes_base.xml
index 920ebd61602..deefbc18262 100644
--- a/lib/java/com/google/android/material/sidesheet/res/values/themes_base.xml
+++ b/lib/java/com/google/android/material/sidesheet/res/values/themes_base.xml
@@ -15,33 +15,25 @@
   ~ limitations under the License.
 -->
 <resources>
-  <style name="Base.V14.Theme.Material3.Light.SideSheetDialog" parent="Theme.Material3.Light.Dialog">
+  <style name="Base.Theme.Material3.Light.SideSheetDialog" parent="Theme.Material3.Light.Dialog">
     <item name="android:windowIsFloating">false</item>
     <item name="android:windowBackground">@android:color/transparent</item>
     <item name="android:windowAnimationStyle">@style/Animation.Material3.SideSheetDialog</item>
     <item name="sideSheetModalStyle">@style/Widget.Material3.SideSheet.Modal</item>
   </style>
 
-  <style name="Base.V14.Theme.Material3.Dark.SideSheetDialog" parent="Theme.Material3.Dark.Dialog">
+  <style name="Base.Theme.Material3.Dark.SideSheetDialog" parent="Theme.Material3.Dark.Dialog">
     <item name="android:windowIsFloating">false</item>
     <item name="android:windowBackground">@android:color/transparent</item>
     <item name="android:windowAnimationStyle">@style/Animation.Material3.SideSheetDialog</item>
     <item name="sideSheetModalStyle">@style/Widget.Material3.SideSheet.Modal</item>
   </style>
 
-  <style name="Base.V14.ThemeOverlay.Material3.SideSheetDialog" parent="Base.ThemeOverlay.Material3.Dialog">
+  <style name="Base.ThemeOverlay.Material3.SideSheetDialog" parent="Base.ThemeOverlay.Material3.Dialog">
+    <item name="android:statusBarColor">@android:color/transparent</item>
     <item name="android:windowIsFloating">false</item>
     <item name="android:windowBackground">@android:color/transparent</item>
     <item name="android:windowAnimationStyle">@style/Animation.Material3.SideSheetDialog</item>
     <item name="sideSheetModalStyle">@style/Widget.Material3.SideSheet.Modal</item>
   </style>
-
-  <style name="Base.V21.ThemeOverlay.Material3.SideSheetDialog"
-    parent="Base.V14.ThemeOverlay.Material3.SideSheetDialog">
-    <item name="android:statusBarColor">@android:color/transparent</item>
-  </style>
-
-  <style name="Base.Theme.Material3.Light.SideSheetDialog" parent="Base.V14.Theme.Material3.Light.SideSheetDialog"/>
-  <style name="Base.Theme.Material3.Dark.SideSheetDialog" parent="Base.V14.Theme.Material3.Dark.SideSheetDialog"/>
-  <style name="Base.ThemeOverlay.Material3.SideSheetDialog" parent="Base.V21.ThemeOverlay.Material3.SideSheetDialog"/>
 </resources>
diff --git a/lib/java/com/google/android/material/textfield/res/values/styles.xml b/lib/java/com/google/android/material/textfield/res/values/styles.xml
index 16ebc0c2d86..ead114cbe8b 100644
--- a/lib/java/com/google/android/material/textfield/res/values/styles.xml
+++ b/lib/java/com/google/android/material/textfield/res/values/styles.xml
@@ -203,8 +203,8 @@
     <item name="android:paddingBottom">13dp</item>
   </style>
 
-  <!-- Base styles for AutoCompleteTextView. You should use one of the sub-styles instead. -->
-  <style name="Base.V14.Widget.MaterialComponents.AutoCompleteTextView" parent="Widget.AppCompat.AutoCompleteTextView">
+  <!-- Base style for AutoCompleteTextView. You should use one of the sub-styles instead. -->
+  <style name="Base.Widget.MaterialComponents.AutoCompleteTextView" parent="Widget.AppCompat.AutoCompleteTextView">
     <item name="enforceMaterialTheme">true</item>
     <item name="enforceTextAppearance">true</item>
     <item name="android:background">@null</item>
@@ -218,11 +218,8 @@
     <item name="android:paddingBottom">17dp</item>
     <item name="android:textAppearance">?attr/textAppearanceSubtitle1</item>
     <item name="android:dropDownVerticalOffset">@dimen/mtrl_exposed_dropdown_menu_popup_vertical_offset</item>
-    <item name="android:popupElevation">@dimen/mtrl_exposed_dropdown_menu_popup_elevation</item>
-  </style>
-
-  <style name="Base.Widget.MaterialComponents.AutoCompleteTextView" parent="Base.V14.Widget.MaterialComponents.AutoCompleteTextView">
     <item name="android:popupBackground">@null</item>
+    <item name="android:popupElevation">@dimen/mtrl_exposed_dropdown_menu_popup_elevation</item>
   </style>
 
   <!-- Styles for the AutocompleteTextView to be used if an ExposedDropdownMenu style is being used. -->
diff --git a/lib/java/com/google/android/material/theme/res/values-v24/themes_base.xml b/lib/java/com/google/android/material/theme/res/values-v24/themes_base.xml
deleted file mode 100644
index ecbe0bc5aa5..00000000000
--- a/lib/java/com/google/android/material/theme/res/values-v24/themes_base.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2021 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
--->
-<resources>
-  <style name="Base.V24.Theme.Material3.Light" parent="Base.V14.Theme.Material3.Light">
-    <item name="android:contextPopupMenuStyle">@style/Widget.Material3.PopupMenu.ContextMenu</item>
-  </style>
-
-  <style name="Base.V24.Theme.Material3.Dark" parent="Base.V14.Theme.Material3.Dark">
-    <item name="android:contextPopupMenuStyle">@style/Widget.Material3.PopupMenu.ContextMenu</item>
-  </style>
-
-  <style name="Base.Theme.Material3.Light" parent="Base.V24.Theme.Material3.Light"/>
-  <style name="Base.Theme.Material3.Dark" parent="Base.V24.Theme.Material3.Dark"/>
-</resources>
diff --git a/lib/java/com/google/android/material/theme/res/values/themes_base.xml b/lib/java/com/google/android/material/theme/res/values/themes_base.xml
index 811daba9ab3..a186d4d95c6 100644
--- a/lib/java/com/google/android/material/theme/res/values/themes_base.xml
+++ b/lib/java/com/google/android/material/theme/res/values/themes_base.xml
@@ -16,9 +16,6 @@
 -->
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-  <!-- All new attributes should be set in the following Base.V14 and Base.V21 themes. -->
-  <eat-comment/>
-
   <!-- Base themes of Theme.Material3Expressive themes. -->
 
   <style name="Base.Theme.Material3Expressive.Light" parent="Base.Theme.Material3.Light">
@@ -165,7 +162,7 @@
 
   <!-- Base themes of Theme.Material3 themes. -->
 
-  <style name="Base.V14.Theme.Material3.Light" parent="Theme.MaterialComponents.Light">
+  <style name="Base.Theme.Material3.Light" parent="Theme.MaterialComponents.Light">
     <item name="isMaterial3Theme">true</item>
 
     <!-- Color palettes -->
@@ -270,6 +267,7 @@
     <item name="collapsingToolbarLayoutStyle">@style/Widget.Material3.CollapsingToolbar</item>
     <item name="collapsingToolbarLayoutMediumStyle">@style/Widget.Material3.CollapsingToolbar.Medium</item>
     <item name="collapsingToolbarLayoutLargeStyle">@style/Widget.Material3.CollapsingToolbar.Large</item>
+    <item name="android:contextPopupMenuStyle" tools:targetApi="n">@style/Widget.Material3.PopupMenu.ContextMenu</item>
     <item name="drawerLayoutStyle">@style/Widget.Material3.DrawerLayout</item>
     <item name="dockedToolbarStyle">@style/Widget.Material3.DockedToolbar</item>
     <item name="dockedToolbarVibrantStyle">@style/Widget.Material3.DockedToolbar.Vibrant</item>
@@ -488,7 +486,7 @@
     <item name="dynamicColorThemeOverlay">@style/ThemeOverlay.Material3.DynamicColors.Light</item>
   </style>
 
-  <style name="Base.V14.Theme.Material3.Dark" parent="Theme.MaterialComponents">
+  <style name="Base.Theme.Material3.Dark" parent="Theme.MaterialComponents">
     <item name="isMaterial3Theme">true</item>
 
     <!-- Color palettes -->
@@ -593,6 +591,7 @@
     <item name="collapsingToolbarLayoutStyle">@style/Widget.Material3.CollapsingToolbar</item>
     <item name="collapsingToolbarLayoutMediumStyle">@style/Widget.Material3.CollapsingToolbar.Medium</item>
     <item name="collapsingToolbarLayoutLargeStyle">@style/Widget.Material3.CollapsingToolbar.Large</item>
+    <item name="android:contextPopupMenuStyle" tools:targetApi="n">@style/Widget.Material3.PopupMenu.ContextMenu</item>
     <item name="drawerLayoutStyle">@style/Widget.Material3.DrawerLayout</item>
     <item name="dockedToolbarStyle">@style/Widget.Material3.DockedToolbar</item>
     <item name="dockedToolbarVibrantStyle">@style/Widget.Material3.DockedToolbar.Vibrant</item>
@@ -811,14 +810,19 @@
     <item name="dynamicColorThemeOverlay">@style/ThemeOverlay.Material3.DynamicColors.Dark</item>
   </style>
 
-  <style name="Base.Theme.Material3.Light" parent="Base.V14.Theme.Material3.Light"/>
-  <style name="Base.Theme.Material3.Dark" parent="Base.V14.Theme.Material3.Dark"/>
-
   <!-- We're not large, so redirect to Base.Theme.Material3 -->
   <style name="Base.Theme.Material3.Light.DialogWhenLarge" parent="Base.Theme.Material3.Light"/>
   <style name="Base.Theme.Material3.Dark.DialogWhenLarge" parent="Base.Theme.Material3.Dark"/>
 
-  <style name="Base.V14.Theme.MaterialComponents" parent="Base.V14.Theme.MaterialComponents.Bridge">
+  <!-- Themes in the "Base.Theme" family vary based on the current platform
+       version to provide the correct basis on each device. You probably don't
+       want to use them directly in your apps.
+
+       Themes in the "Theme.MaterialComponents" family are meant to be extended or used
+       directly by apps. -->
+  <eat-comment/>
+
+  <style name="Base.Theme.MaterialComponents" parent="Base.Theme.MaterialComponents.Bridge">
     <item name="viewInflaterClass">com.google.android.material.theme.MaterialComponentsViewInflater</item>
 
     <!-- Colors -->
@@ -867,6 +871,7 @@
     <!-- Dialog themes -->
     <item name="bottomSheetDialogTheme">@style/ThemeOverlay.MaterialComponents.BottomSheetDialog</item>
     <item name="alertDialogTheme">@style/ThemeOverlay.MaterialComponents.Dialog.Alert</item>
+    <item name="android:alertDialogTheme">@style/ThemeOverlay.MaterialComponents.Dialog.Alert.Framework</item>
     <item name="materialAlertDialogTheme">@style/ThemeOverlay.MaterialComponents.MaterialAlertDialog</item>
     <item name="android:datePickerDialogTheme">@style/ThemeOverlay.MaterialComponents.Dialog</item>
     <item name="android:timePickerDialogTheme">@style/ThemeOverlay.MaterialComponents.Dialog</item>
@@ -882,11 +887,7 @@
     <item name="materialTimePickerTheme">@style/ThemeOverlay.MaterialComponents.TimePicker</item>
   </style>
 
-  <style name="Base.V21.Theme.MaterialComponents" parent="Base.V14.Theme.MaterialComponents">
-    <item name="android:alertDialogTheme">@style/ThemeOverlay.MaterialComponents.Dialog.Alert.Framework</item>
-  </style>
-
-  <style name="Base.V14.Theme.MaterialComponents.Light" parent="Base.V14.Theme.MaterialComponents.Light.Bridge">
+  <style name="Base.Theme.MaterialComponents.Light" parent="Base.Theme.MaterialComponents.Light.Bridge">
     <item name="viewInflaterClass">com.google.android.material.theme.MaterialComponentsViewInflater</item>
 
     <!-- Colors -->
@@ -934,6 +935,7 @@
     <!-- Dialog themes -->
     <item name="bottomSheetDialogTheme">@style/ThemeOverlay.MaterialComponents.BottomSheetDialog</item>
     <item name="alertDialogTheme">@style/ThemeOverlay.MaterialComponents.Dialog.Alert</item>
+    <item name="android:alertDialogTheme">@style/ThemeOverlay.MaterialComponents.Light.Dialog.Alert.Framework</item>
     <item name="materialAlertDialogTheme">@style/ThemeOverlay.MaterialComponents.MaterialAlertDialog</item>
     <item name="android:datePickerDialogTheme">@style/ThemeOverlay.MaterialComponents.Dialog</item>
     <item name="android:timePickerDialogTheme">@style/ThemeOverlay.MaterialComponents.Dialog</item>
@@ -949,22 +951,6 @@
     <item name="materialTimePickerTheme">@style/ThemeOverlay.MaterialComponents.TimePicker</item>
   </style>
 
-  <style name="Base.V21.Theme.MaterialComponents.Light" parent="Base.V14.Theme.MaterialComponents.Light">
-    <item name="android:alertDialogTheme">@style/ThemeOverlay.MaterialComponents.Light.Dialog.Alert.Framework</item>
-  </style>
-
-  <!-- Themes in the "Base.Theme" family vary based on the current platform
-       version to provide the correct basis on each device. You probably don't
-       want to use them directly in your apps.
-
-       Themes in the "Theme.MaterialComponents" family are meant to be extended or used
-       directly by apps. -->
-  <eat-comment/>
-
-  <style name="Base.Theme.MaterialComponents" parent="Base.V21.Theme.MaterialComponents"/>
-
-  <style name="Base.Theme.MaterialComponents.Light" parent="Base.V21.Theme.MaterialComponents.Light"/>
-
   <style name="Base.Theme.MaterialComponents.Light.DarkActionBar" parent="Base.Theme.MaterialComponents.Light">
     <item name="actionBarWidgetTheme">@null</item>
     <item name="actionBarTheme">@style/ThemeOverlay.MaterialComponents.Dark.ActionBar</item>
diff --git a/lib/java/com/google/android/material/theme/res/values/themes_base_bridge.xml b/lib/java/com/google/android/material/theme/res/values/themes_base_bridge.xml
index 3b1915c6a7e..0d6b6ffdfc0 100644
--- a/lib/java/com/google/android/material/theme/res/values/themes_base_bridge.xml
+++ b/lib/java/com/google/android/material/theme/res/values/themes_base_bridge.xml
@@ -27,10 +27,15 @@
 
   <style name="Platform.MaterialComponents.Light" parent="Theme.AppCompat.Light"/>
 
-  <!-- All new attributes should be set in the following four Base.V14 themes. -->
+  <!-- Themes in the "Base.Theme" family vary based on the current platform
+       version to provide the correct basis on each device. You probably don't
+       want to use them directly in your apps.
+
+       Themes in the "Theme.MaterialComponents" family are meant to be extended or used
+       directly by apps. -->
   <eat-comment/>
 
-  <style name="Base.V14.Theme.MaterialComponents.Bridge" parent="Platform.MaterialComponents">
+  <style name="Base.Theme.MaterialComponents.Bridge" parent="Platform.MaterialComponents">
     <item name="isMaterialTheme">true</item>
 
     <item name="colorPrimaryVariant">@color/design_dark_default_color_primary_variant</item>
@@ -113,7 +118,7 @@
     <item name="elevationOverlayColor">?attr/colorOnSurface</item>
   </style>
 
-  <style name="Base.V14.Theme.MaterialComponents.Light.Bridge" parent="Platform.MaterialComponents.Light">
+  <style name="Base.Theme.MaterialComponents.Light.Bridge" parent="Platform.MaterialComponents.Light">
     <item name="isMaterialTheme">true</item>
 
     <item name="colorPrimaryVariant">@color/design_default_color_primary_variant</item>
@@ -196,7 +201,7 @@
     <item name="elevationOverlayColor">?attr/colorOnSurface</item>
   </style>
 
-  <style name="Base.V14.Theme.MaterialComponents.Light.DarkActionBar.Bridge" parent="Theme.AppCompat.Light.DarkActionBar">
+  <style name="Base.Theme.MaterialComponents.Light.DarkActionBar.Bridge" parent="Theme.AppCompat.Light.DarkActionBar">
     <item name="isMaterialTheme">true</item>
 
     <item name="colorPrimaryVariant">@color/design_default_color_primary_variant</item>
@@ -261,18 +266,4 @@
     <item name="elevationOverlayColor">?attr/colorOnSurface</item>
   </style>
 
-  <!-- Themes in the "Base.Theme" family vary based on the current platform
-       version to provide the correct basis on each device. You probably don't
-       want to use them directly in your apps.
-
-       Themes in the "Theme.MaterialComponents" family are meant to be extended or used
-       directly by apps. -->
-  <eat-comment/>
-
-  <style name="Base.Theme.MaterialComponents.Bridge" parent="Base.V14.Theme.MaterialComponents.Bridge"/>
-
-  <style name="Base.Theme.MaterialComponents.Light.Bridge" parent="Base.V14.Theme.MaterialComponents.Light.Bridge"/>
-
-  <style name="Base.Theme.MaterialComponents.Light.DarkActionBar.Bridge" parent="Base.V14.Theme.MaterialComponents.Light.DarkActionBar.Bridge"/>
-
 </resources>