diff --git a/lib/java/com/google/android/material/timepicker/ClockFaceView.java b/lib/java/com/google/android/material/timepicker/ClockFaceView.java
index 3cc513d39..11c9f7d17 100644
--- a/lib/java/com/google/android/material/timepicker/ClockFaceView.java
+++ b/lib/java/com/google/android/material/timepicker/ClockFaceView.java
@@ -38,6 +38,7 @@ import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.CollectionIn
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.CollectionItemInfoCompat;
 import androidx.appcompat.content.res.AppCompatResources;
 import android.util.AttributeSet;
+import android.util.DisplayMetrics;
 import android.util.SparseArray;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -74,6 +75,9 @@ class ClockFaceView extends RadialViewGroup implements OnRotateListener {
   private final int[] gradientColors;
   private final float[] gradientPositions = new float[] {0f, 0.9f, 1f};
   private final int clockHandPadding;
+  private final int minimumHeight;
+  private final int minimumWidth;
+  private final int clockSize;
 
   private String[] values;
 
@@ -167,6 +171,10 @@ class ClockFaceView extends RadialViewGroup implements OnRotateListener {
     String[] initialValues = new String[INITIAL_CAPACITY];
     Arrays.fill(initialValues, VALUE_PLACEHOLDER);
     setValues(initialValues, /* contentDescription= */ 0);
+
+    minimumHeight = res.getDimensionPixelSize(R.dimen.material_time_picker_minimum_screen_height);
+    minimumWidth = res.getDimensionPixelSize(R.dimen.material_time_picker_minimum_screen_width);
+    clockSize = res.getDimensionPixelSize(R.dimen.material_clock_size);
   }
 
   /**
@@ -278,4 +286,25 @@ class ClockFaceView extends RadialViewGroup implements OnRotateListener {
       findIntersectingTextView();
     }
   }
+
+  @Override
+  protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+    Resources r = getResources();
+    DisplayMetrics displayMetrics = r.getDisplayMetrics();
+
+    float height = displayMetrics.heightPixels;
+    float width = displayMetrics.widthPixels;
+
+    // If the screen is smaller than our defined values. Scale the clock face
+    // proportionally to the smaller size
+    int size = (int) (clockSize / max3(minimumHeight / height, minimumWidth / width, 1f));
+
+    int spec = MeasureSpec.makeMeasureSpec(size, MeasureSpec.EXACTLY);
+    setMeasuredDimension(size, size);
+    super.onMeasure(spec, spec);
+  }
+
+  private static float max3(float a, float b, float c) {
+    return max(max(a, b), c);
+  }
 }
diff --git a/lib/java/com/google/android/material/timepicker/res/layout-land/material_timepicker.xml b/lib/java/com/google/android/material/timepicker/res/layout-land/material_timepicker.xml
index 2124915df..f703571aa 100644
--- a/lib/java/com/google/android/material/timepicker/res/layout-land/material_timepicker.xml
+++ b/lib/java/com/google/android/material/timepicker/res/layout-land/material_timepicker.xml
@@ -52,8 +52,8 @@
 
   <com.google.android.material.timepicker.ClockFaceView
     android:id="@+id/material_clock_face"
-    android:layout_width="@dimen/material_clock_size"
-    android:layout_height="@dimen/material_clock_size"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
     android:layout_marginStart="@dimen/clock_face_margin_start"
     app:layout_constraintStart_toEndOf="@+id/material_clock_display"
     app:layout_constraintTop_toTopOf="parent" />
diff --git a/lib/java/com/google/android/material/timepicker/res/layout/material_timepicker.xml b/lib/java/com/google/android/material/timepicker/res/layout/material_timepicker.xml
index 86a21744d..d056a6edf 100644
--- a/lib/java/com/google/android/material/timepicker/res/layout/material_timepicker.xml
+++ b/lib/java/com/google/android/material/timepicker/res/layout/material_timepicker.xml
@@ -30,8 +30,8 @@
 
   <com.google.android.material.timepicker.ClockFaceView
     android:id="@+id/material_clock_face"
-    android:layout_width="@dimen/material_clock_size"
-    android:layout_height="@dimen/material_clock_size"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
     android:layout_marginTop="36dp"
     android:layout_gravity="center"
     app:layout_constraintStart_toStartOf="parent"
diff --git a/lib/java/com/google/android/material/timepicker/res/values-h320dp-port/dimens.xml b/lib/java/com/google/android/material/timepicker/res/values-h320dp-port/dimens.xml
index 65bcb5103..01209ae9a 100644
--- a/lib/java/com/google/android/material/timepicker/res/values-h320dp-port/dimens.xml
+++ b/lib/java/com/google/android/material/timepicker/res/values-h320dp-port/dimens.xml
@@ -16,6 +16,5 @@
 -->
 
 <resources>
-  <dimen name="material_clock_size">210dp</dimen>
   <dimen name="material_timepicker_dialog_buttons_margin_top">8dp</dimen>
 </resources>
diff --git a/lib/java/com/google/android/material/timepicker/res/values-h550dp-port/dimens.xml b/lib/java/com/google/android/material/timepicker/res/values-h550dp-port/dimens.xml
index 3c5206fc3..30610cfba 100644
--- a/lib/java/com/google/android/material/timepicker/res/values-h550dp-port/dimens.xml
+++ b/lib/java/com/google/android/material/timepicker/res/values-h550dp-port/dimens.xml
@@ -16,6 +16,5 @@
 -->
 
 <resources>
-  <dimen name="material_clock_size">230dp</dimen>
   <dimen name="material_timepicker_dialog_buttons_margin_top">24dp</dimen>
 </resources>
diff --git a/lib/java/com/google/android/material/timepicker/res/values-h600dp-port/dimens.xml b/lib/java/com/google/android/material/timepicker/res/values-land/dimens.xml
similarity index 76%
rename from lib/java/com/google/android/material/timepicker/res/values-h600dp-port/dimens.xml
rename to lib/java/com/google/android/material/timepicker/res/values-land/dimens.xml
index 457e5c353..21ac6accd 100644
--- a/lib/java/com/google/android/material/timepicker/res/values-h600dp-port/dimens.xml
+++ b/lib/java/com/google/android/material/timepicker/res/values-land/dimens.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 2020 The Android Open Source Project
+    Copyright 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.
@@ -14,7 +14,9 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-
 <resources>
-  <dimen name="material_clock_size">256dp</dimen>
+
+  <dimen name="material_time_picker_minimum_screen_height">450dp</dimen>
+  <dimen name="material_time_picker_minimum_screen_width">600dp</dimen>
+
 </resources>
diff --git a/lib/java/com/google/android/material/timepicker/res/values-w320dp-land/dimens.xml b/lib/java/com/google/android/material/timepicker/res/values-w320dp-land/dimens.xml
index eb48df34e..a9d5e50bb 100644
--- a/lib/java/com/google/android/material/timepicker/res/values-w320dp-land/dimens.xml
+++ b/lib/java/com/google/android/material/timepicker/res/values-w320dp-land/dimens.xml
@@ -16,7 +16,6 @@
 -->
 
 <resources>
-  <dimen name="material_clock_size">170dp</dimen>
   <dimen name="clock_face_margin_start">24dp</dimen>
   <dimen name="material_clock_face_margin_top">36dp</dimen>
 </resources>
diff --git a/lib/java/com/google/android/material/timepicker/res/values-w550dp-land/dimens.xml b/lib/java/com/google/android/material/timepicker/res/values-w550dp-land/dimens.xml
deleted file mode 100644
index c16385b63..000000000
--- a/lib/java/com/google/android/material/timepicker/res/values-w550dp-land/dimens.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright 2020 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>
-  <dimen name="material_clock_size">200dp</dimen>
-</resources>
diff --git a/lib/java/com/google/android/material/timepicker/res/values-w600dp-land/dimens.xml b/lib/java/com/google/android/material/timepicker/res/values-w600dp-land/dimens.xml
index c956ede12..59d29cc25 100644
--- a/lib/java/com/google/android/material/timepicker/res/values-w600dp-land/dimens.xml
+++ b/lib/java/com/google/android/material/timepicker/res/values-w600dp-land/dimens.xml
@@ -16,6 +16,5 @@
 -->
 
 <resources>
-  <dimen name="material_clock_size">240dp</dimen>
   <dimen name="clock_face_margin_start">64dp</dimen>
 </resources>
diff --git a/lib/java/com/google/android/material/timepicker/res/values/dimens.xml b/lib/java/com/google/android/material/timepicker/res/values/dimens.xml
index 6773ac459..a3ab6080d 100644
--- a/lib/java/com/google/android/material/timepicker/res/values/dimens.xml
+++ b/lib/java/com/google/android/material/timepicker/res/values/dimens.xml
@@ -21,7 +21,6 @@
   <dimen name="material_clock_period_toggle_width">52dp</dimen>
   <dimen name="material_clock_period_toggle_margin_left">12dp</dimen>
   <dimen name="material_clock_face_margin_top">44dp</dimen>
-  <dimen name="material_clock_size">256dp</dimen>
   <dimen name="clock_face_margin_start">64dp</dimen>
   <dimen name="material_timepicker_dialog_buttons_margin_top">24dp</dimen>
   <dimen name="material_clock_hand_stroke_width">2dp</dimen>
@@ -35,4 +34,8 @@
   <dimen name="material_cursor_inset_top">-12dp</dimen>
   <dimen name="material_cursor_width">2dp</dimen>
 
+  <dimen name="material_clock_size">256dp</dimen>
+
+  <dimen name="material_time_picker_minimum_screen_height">560dp</dimen>
+  <dimen name="material_time_picker_minimum_screen_width">340dp</dimen>
 </resources>