summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSantiago Etchebehere <santie@google.com>2019-08-05 16:27:57 -0700
committerSantiago Etchebehere <santie@google.com>2019-08-05 16:27:57 -0700
commit45d5cd2c30a95da972184e51e866ea44ae359f30 (patch)
tree28458a3aa3ae27b497830d58c31a2c82e9e68cca
parent77db8d06699f9a7a138c79f284730d518ebbaa89 (diff)
parente5f24a61c974e5b3e9efb487c12c895e226be630 (diff)
downloadThemePicker-45d5cd2c30a95da972184e51e866ea44ae359f30.tar.gz
Merging ub-launcher3-qt-r1-dev, build 5781802
Test: Manual Bug:138956269 P2 Color option selector in custom theme truncated in smaller screens Change-Id: I2f992b381669ed400f3bee3687f10838a0034b62
-rw-r--r--res/layout/theme_color_option.xml4
-rw-r--r--res/values/dimens.xml1
2 files changed, 3 insertions, 2 deletions
diff --git a/res/layout/theme_color_option.xml b/res/layout/theme_color_option.xml
index 12fe623f..33e4668d 100644
--- a/res/layout/theme_color_option.xml
+++ b/res/layout/theme_color_option.xml
@@ -22,8 +22,8 @@
<ImageView
android:id="@+id/option_tile"
- android:layout_width="@dimen/component_color_chip_size"
- android:layout_height="@dimen/component_color_chip_size"
+ android:layout_width="@dimen/component_color_chip_container_size"
+ android:layout_height="@dimen/component_color_chip_container_size"
android:layout_gravity="center"
android:src="@drawable/color_chip"/>
</FrameLayout>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index b6aac0be..a2cb88ba 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -96,6 +96,7 @@
<dimen name="component_icon_thumb_size">40dp</dimen>
<dimen name="component_color_chip_size">32dp</dimen>
+ <dimen name="component_color_chip_container_size">33dp</dimen>
<dimen name="component_shape_thumb_size">72dp</dimen>
<dimen name="option_border_width">2dp</dimen>