Snap for 5785232 from 45d5cd2c30a95da972184e51e866ea44ae359f30 to qt-c2f2-release

Change-Id: I9183ca0b20ea5ef51d215c4249ce70a8ed9f76c4
diff --git a/res/layout/theme_color_option.xml b/res/layout/theme_color_option.xml
index 12fe623..33e4668 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 b6aac0b..a2cb88b 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>