7 files changed, 12 insertions, 9 deletions
diff --git a/java/res/layout/chooser_action_view.xml b/java/res/layout/chooser_action_view.xml
index 724274a6..a5436ed5 100644
--- a/java/res/layout/chooser_action_view.xml
+++ b/java/res/layout/chooser_action_view.xml
@@ -19,7 +19,7 @@
     android:drawablePadding="8dp"
     android:textColor="?android:attr/textColorPrimary"
     android:textSize="12sp"
-    android:maxWidth="80dp"
+    android:maxWidth="@dimen/chooser_action_max_width"
     android:clickable="true"
     android:drawableTint="?android:attr/textColorPrimary"
     android:drawableTintMode="src_in"
diff --git a/java/res/layout/chooser_grid_preview_files_text.xml b/java/res/layout/chooser_grid_preview_files_text.xml
index d46da2c0..2b5586cb 100644
--- a/java/res/layout/chooser_grid_preview_files_text.xml
+++ b/java/res/layout/chooser_grid_preview_files_text.xml
@@ -38,8 +38,8 @@
 
         <com.android.intentresolver.widget.RoundedRectImageView
             android:id="@+id/image_view"
-            android:layout_width="100dp"
-            android:layout_height="100dp"
+            android:layout_width="@dimen/width_text_image_preview_size"
+            android:layout_height="@dimen/width_text_image_preview_size"
             android:scaleType="centerCrop"
             app:radius="@dimen/chooser_corner_radius_small"
         />
diff --git a/java/res/layout/chooser_grid_preview_text.xml b/java/res/layout/chooser_grid_preview_text.xml
index e22cfbd2..ca4604c0 100644
--- a/java/res/layout/chooser_grid_preview_text.xml
+++ b/java/res/layout/chooser_grid_preview_text.xml
@@ -37,7 +37,6 @@
       android:layout_marginRight="@dimen/chooser_edge_margin_normal"
       android:layout_marginBottom="@dimen/chooser_view_spacing"
       android:padding="@dimen/chooser_edge_margin_normal"
-      android:minHeight="80dp"
       android:background="@drawable/chooser_content_preview_rounded"
       android:id="@+id/text_preview_layout">
 
diff --git a/java/res/values-h480dp/bools.xml b/java/res/values-h480dp/bools.xml
index 761de1ea..749f7e8c 100644
--- a/java/res/values-h480dp/bools.xml
+++ b/java/res/values-h480dp/bools.xml
@@ -17,4 +17,5 @@
 
 <resources>
     <bool name="horizontal_actions">false</bool>
+    <bool name="minimal_preview">false</bool>
 </resources>
diff --git a/java/res/values-h480dp/dimens.xml b/java/res/values-h480dp/dimens.xml
index 41a5a980..3bfa3083 100644
--- a/java/res/values-h480dp/dimens.xml
+++ b/java/res/values-h480dp/dimens.xml
@@ -21,7 +21,8 @@
     <dimen name="resolver_title_padding_bottom">@dimen/resolver_edge_margin</dimen>
     <dimen name="resolver_button_bar_spacing">8dp</dimen>
 
-    <dimen name="chooser_preview_image_height_tall">192dp</dimen>
     <dimen name="chooser_preview_width">-1px</dimen>
     <dimen name="chooser_view_spacing">18dp</dimen>
+    <dimen name="chooser_action_max_width">80dp</dimen>
+    <dimen name="width_text_image_preview_size">100dp</dimen>
 </resources>
diff --git a/java/res/values/bools.xml b/java/res/values/bools.xml
index fb7c747b..38d97d8e 100644
--- a/java/res/values/bools.xml
+++ b/java/res/values/bools.xml
@@ -15,7 +15,8 @@
 -->
 
 <resources>
-  <!-- Note that this is the value for landscape phones, the value for all screens taller than
-       480dp is set in values-h480dp/bools.xml -->
+  <!-- Note that these values are for landscape phones, the values for all screens taller than
+       480dp are set in values-h480dp/bools.xml -->
   <bool name="horizontal_actions">true</bool>
+  <bool name="minimal_preview">true</bool>
 </resources>
diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml
index cd1ae1ca..e0a3b2c6 100644
--- a/java/res/values/dimens.xml
+++ b/java/res/values/dimens.xml
@@ -49,14 +49,15 @@
     <dimen name="resolver_empty_state_container_padding_top">48dp</dimen>
     <dimen name="resolver_empty_state_container_padding_bottom">8dp</dimen>
     <dimen name="resolver_profile_tab_margin">4dp</dimen>
-
+    <dimen name="chooser_preview_image_height_tall">192dp</dimen>
     <dimen name="chooser_action_view_icon_size">22dp</dimen>
     <dimen name="chooser_action_margin">0dp</dimen>
 
     <!-- Note that the values in this section are for landscape phones. For screen configs taller
          than 480dp, the values are set in values-h480dp/dimens.xml -->
     <dimen name="chooser_preview_width">412dp</dimen>
-    <dimen name="chooser_preview_image_height_tall">64dp</dimen>
     <dimen name="chooser_view_spacing">8dp</dimen>
+    <dimen name="chooser_action_max_width">120dp</dimen>
+    <dimen name="width_text_image_preview_size">32dp</dimen>
     <!-- END SECTION -->
 </resources>