Remove separate range and single date picker styles

PiperOrigin-RevId: 250561429

Author: ldjcmu

lib/java/com/google/android/material/picker/DateGridSelector.java

@@ -50,7 +50,7 @@ public void drawCell(TextView cell, Calendar item) {
     Context context = cell.getContext();
     int calendarStyle =
         MaterialAttributes.resolveOrThrow(
-            context, R.attr.materialDatePickerStyle, MaterialCalendar.class.getCanonicalName());
+            context, R.attr.materialCalendarStyle, MaterialCalendar.class.getCanonicalName());
 
     int style;
     TypedArray stylesList =

lib/java/com/google/android/material/picker/DateRangeGridSelector.java

@@ -65,7 +65,7 @@ private void initializeStyles(Context context) {
     int rangeCalendarStyle =
         MaterialAttributes.resolveOrThrow(
             context,
-            R.attr.materialDateRangePickerStyle,
+            R.attr.materialCalendarStyle,
             MaterialCalendar.class.getCanonicalName());
 
     TypedArray calendarAttributes =

lib/java/com/google/android/material/picker/MaterialDatePickerDialogFragment.java

@@ -56,7 +56,7 @@ public static MaterialDatePickerDialogFragment newInstance(
 
   @Override
   protected int getDefaultThemeAttr() {
-    return R.attr.materialDatePickerDialogTheme;
+    return R.attr.materialCalendarTheme;
   }
 
   @Override

lib/java/com/google/android/material/picker/MaterialDateRangePickerDialogFragment.java

@@ -60,7 +60,7 @@ public static MaterialDateRangePickerDialogFragment newInstance(
 
   @Override
   protected int getDefaultThemeAttr() {
-    return R.attr.materialDateRangePickerDialogTheme;
+    return R.attr.materialCalendarTheme;
   }
 
   @Override

lib/java/com/google/android/material/picker/res/values/attrs.xml

@@ -15,10 +15,8 @@
   ~ limitations under the License.
 -->
 <resources>
-  <attr name="materialDatePickerStyle" format="reference"/>
-  <attr name="materialDateRangePickerStyle" format="reference"/>
-  <attr name="materialDatePickerDialogTheme" format="reference"/>
-  <attr name="materialDateRangePickerDialogTheme" format="reference"/>
+  <attr name="materialCalendarStyle" format="reference"/>
+  <attr name="materialCalendarTheme" format="reference"/>
 
   <!-- Header Styles -->
   <attr name="materialCalendarHeaderLayout" format="reference"/>

lib/java/com/google/android/material/picker/res/values/styles.xml

@@ -36,10 +36,6 @@
     <item name="rangeFillColor">@color/mtrl_calendar_selected_range</item>
   </style>
 
-  <style name="Widget.MaterialComponents.MaterialCalendar.DateRangePicker"/>
-
-  <style name="Widget.MaterialComponents.MaterialCalendar.DatePicker"/>
-
   <style name="Widget.MaterialComponents.MaterialCalendar.HeaderLayout" parent="android:Widget">
     <item name="android:orientation">vertical</item>
     <item name="android:background">?attr/colorPrimary</item>

lib/java/com/google/android/material/picker/res/values/themes.xml

@@ -35,6 +35,4 @@
     <item name="buttonBarNegativeButtonStyle">@style/Widget.MaterialComponents.Button.TextButton.Dialog</item>
   </style>
 
-  <style name="ThemeOverlay.MaterialComponents.MaterialCalendar.DatePicker"/>
-  <style name="ThemeOverlay.MaterialComponents.MaterialCalendar.DateRangePicker"/>
 </resources>

lib/java/com/google/android/material/theme/res/values/themes_base.xml

@@ -78,10 +78,8 @@
     <item name="textAppearanceSmallPopupMenu">?attr/textAppearanceSubtitle1</item>
 
     <!-- Picker styles and themes. -->
-    <item name="materialDatePickerStyle">@style/Widget.MaterialComponents.MaterialCalendar.DatePicker</item>
-    <item name="materialDateRangePickerStyle">@style/Widget.MaterialComponents.MaterialCalendar.DateRangePicker</item>
-    <item name="materialDatePickerDialogTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar.DatePicker</item>
-    <item name="materialDateRangePickerDialogTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar.DateRangePicker</item>
+    <item name="materialCalendarStyle">@style/Widget.MaterialComponents.MaterialCalendar</item>
+    <item name="materialCalendarTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar</item>
   </style>
 
   <style name="Base.V14.Theme.MaterialComponents.Light" parent="Base.V14.Theme.MaterialComponents.Light.Bridge">
@@ -142,10 +140,8 @@
     <item name="textAppearanceSmallPopupMenu">?attr/textAppearanceSubtitle1</item>
 
     <!-- Picker styles and themes. -->
-    <item name="materialDatePickerStyle">@style/Widget.MaterialComponents.MaterialCalendar.DatePicker</item>
-    <item name="materialDateRangePickerStyle">@style/Widget.MaterialComponents.MaterialCalendar.DateRangePicker</item>
-    <item name="materialDatePickerDialogTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar.DatePicker</item>
-    <item name="materialDateRangePickerDialogTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar.DateRangePicker</item>
+    <item name="materialCalendarStyle">@style/Widget.MaterialComponents.MaterialCalendar</item>
+    <item name="materialCalendarTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar</item>
   </style>
 
   <!-- Themes in the "Base.Theme" family vary based on the current platform