Merge "Update some UI in PhotoPicker" into sc-mainline-prod
diff --git a/res/layout/fragment_preview.xml b/res/layout/fragment_preview.xml
index 6b058fc..ede43a1 100644
--- a/res/layout/fragment_preview.xml
+++ b/res/layout/fragment_preview.xml
@@ -62,7 +62,7 @@
android:textAllCaps="false"
android:text="@string/deselect"
android:textColor="@color/picker_default_white"
- android:textSize="@dimen/preview_deselect_text_size" />
+ style="?attr/borderlessButtonStyle"/>
<Button
android:id="@+id/preview_add_or_select_button"
@@ -73,6 +73,6 @@
android:text="@string/add"
android:textAllCaps="false"
android:textColor="@color/preview_default_grey"
- android:textSize="@dimen/preview_add_text_size"/>
+ style="?attr/materialButtonStyle"/>
</FrameLayout>
</FrameLayout>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index c08e41a..eb9d42c 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -52,7 +52,7 @@
<dimen name="picker_photo_item_spacing">3dp</dimen>
- <dimen name="picker_chip_text_size">14sp</dimen>
+ <dimen name="picker_chip_text_size">16sp</dimen>
<dimen name="picker_chip_touch_size">48dp</dimen>
<dimen name="picker_chip_radius">16dp</dimen>
@@ -61,8 +61,6 @@
<dimen name="preview_deselect_padding_start">2dp</dimen>
<dimen name="preview_viewpager_margin">20dp</dimen>
<!-- PhotoPicker Preview text -->
- <dimen name="preview_add_text_size">14sp</dimen>
- <dimen name="preview_deselect_text_size">16sp</dimen>
<dimen name="preview_toolbar_scrim_height">96dp</dimen>
<dimen name="preview_deselect_scrim_height">240dp</dimen>