[MaterialDatePicker] Fix excessive whitespace

Resolves #2162
Resolves #2161

GIT_ORIGIN_REV_ID=9d272c4563f354bedcb0342957ebb2207bceecdf
PiperOrigin-RevId: 394235301

Author: Orthae

lib/java/com/google/android/material/datepicker/MaterialCalendar.java

@@ -18,6 +18,7 @@
 import com.google.android.material.R;
 
 import android.content.Context;
+import android.content.res.Resources;
 import android.graphics.Canvas;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
@@ -147,6 +148,7 @@ public View onCreateView(
     }
 
     View root = themedInflater.inflate(layout, viewGroup, false);
+    root.setMinimumHeight(getDialogPickerHeight(requireContext()));
     GridView daysHeader = root.findViewById(R.id.mtrl_calendar_days_of_week);
     ViewCompat.setAccessibilityDelegate(
         daysHeader,
@@ -456,6 +458,23 @@ public void run() {
         });
   }
 
+  private static int getDialogPickerHeight(@NonNull Context context) {
+    Resources resources = context.getResources();
+    int navigationHeight =
+        resources.getDimensionPixelSize(R.dimen.mtrl_calendar_navigation_height)
+            + resources.getDimensionPixelOffset(R.dimen.mtrl_calendar_navigation_top_padding)
+            + resources.getDimensionPixelOffset(R.dimen.mtrl_calendar_navigation_bottom_padding);
+    int daysOfWeekHeight =
+        resources.getDimensionPixelSize(R.dimen.mtrl_calendar_days_of_week_height);
+    int calendarHeight =
+        MonthAdapter.MAXIMUM_WEEKS
+            * resources.getDimensionPixelSize(R.dimen.mtrl_calendar_day_height)
+            + (MonthAdapter.MAXIMUM_WEEKS - 1)
+            * resources.getDimensionPixelOffset(R.dimen.mtrl_calendar_month_vertical_padding);
+    int calendarPadding = resources.getDimensionPixelOffset(R.dimen.mtrl_calendar_bottom_padding);
+    return navigationHeight + daysOfWeekHeight + calendarHeight + calendarPadding;
+  }
+
   @NonNull
   LinearLayoutManager getLayoutManager() {
     return (LinearLayoutManager) recyclerView.getLayoutManager();

lib/java/com/google/android/material/datepicker/MaterialDatePicker.java

@@ -215,10 +215,8 @@ public final View onCreateView(
           new LayoutParams(getPaddedPickerWidth(context), LayoutParams.WRAP_CONTENT));
     } else {
       View pane = root.findViewById(R.id.mtrl_calendar_main_pane);
-      View frame = root.findViewById(R.id.mtrl_calendar_frame);
       pane.setLayoutParams(
           new LayoutParams(getPaddedPickerWidth(context), LayoutParams.MATCH_PARENT));
-      frame.setMinimumHeight(getDialogPickerHeight(requireContext()));
     }
 
     headerSelectionText = root.findViewById(R.id.mtrl_picker_header_selection_text);
@@ -429,23 +427,6 @@ static boolean readMaterialCalendarStyleBoolean(@NonNull Context context, int at
     return attributeValue;
   }
 
-  private static int getDialogPickerHeight(@NonNull Context context) {
-    Resources resources = context.getResources();
-    int navigationHeight =
-        resources.getDimensionPixelSize(R.dimen.mtrl_calendar_navigation_height)
-            + resources.getDimensionPixelOffset(R.dimen.mtrl_calendar_navigation_top_padding)
-            + resources.getDimensionPixelOffset(R.dimen.mtrl_calendar_navigation_bottom_padding);
-    int daysOfWeekHeight =
-        resources.getDimensionPixelSize(R.dimen.mtrl_calendar_days_of_week_height);
-    int calendarHeight =
-        MonthAdapter.MAXIMUM_WEEKS
-                * resources.getDimensionPixelSize(R.dimen.mtrl_calendar_day_height)
-            + (MonthAdapter.MAXIMUM_WEEKS - 1)
-                * resources.getDimensionPixelOffset(R.dimen.mtrl_calendar_month_vertical_padding);
-    int calendarPadding = resources.getDimensionPixelOffset(R.dimen.mtrl_calendar_bottom_padding);
-    return navigationHeight + daysOfWeekHeight + calendarHeight + calendarPadding;
-  }
-
   private static int getPaddedPickerWidth(@NonNull Context context) {
     Resources resources = context.getResources();
     int padding = resources.getDimensionPixelOffset(R.dimen.mtrl_calendar_content_padding);