commit f18580d0fdd52ed84af162538cfb649a80e58f24
author Santiago Etchebehere <santie@google.com> Thu Jan 10 10:24:42 2019 -0800
committer Santiago Etchebehere <santie@google.com> Tue Jan 15 15:25:28 2019 -0800
tree fc9b8edd227755364469560505efff68662c1da9
parent 79ce19b8564a75721cabcb484e0069fcd4903131

[ThemePicker 9/N] Read shape and icon from theme stub

Load the shape and icons from stub and overlays and display
them in the theme thumbnails.

Bug: 120559294
Change-Id: I40ae07070370fb33ada7060bf7161a0565109107

res/layout/theme_option.xml

diff --git a/res/layout/theme_option.xml b/res/layout/theme_option.xml
index 9e2ef82..5560a35 100644
--- a/res/layout/theme_option.xml
+++ b/res/layout/theme_option.xml
@@ -36,7 +36,7 @@
         android:background="@drawable/option_border">
         <TextView
             android:id="@+id/theme_option_font"
-            android:layout_width="wrap_content"
+            android:layout_width="@dimen/theme_option_sample_width"
             android:layout_height="@dimen/theme_option_sample_height"
             android:layout_alignParentTop="true"
             android:layout_alignParentLeft="true"
@@ -45,22 +45,26 @@
             android:text="@string/theme_font_example"/>
         <ImageView
             android:id="@+id/theme_option_shape"
-            android:layout_width="@dimen/theme_option_sample_right_width"
+            android:layout_width="@dimen/theme_option_sample_width"
             android:layout_height="@dimen/theme_option_sample_height"
             android:layout_alignParentTop="true"
-            android:layout_alignParentRight="true"/>
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:padding="@dimen/theme_option_sample_padding"/>
         <ImageView
             android:id="@+id/theme_option_color"
-            android:layout_width="@dimen/theme_option_sample_left_width"
+            android:layout_width="@dimen/theme_option_sample_width"
             android:layout_height="@dimen/theme_option_sample_height"
             android:layout_alignParentBottom="true"
             android:layout_alignParentLeft="true"
+            android:padding="@dimen/theme_option_sample_padding"
             android:src="@drawable/option_color"/>
         <ImageView
             android:id="@+id/theme_option_icon"
-            android:layout_width="@dimen/theme_option_sample_right_width"
+            android:layout_width="@dimen/theme_option_sample_width"
             android:layout_height="@dimen/theme_option_sample_height"
             android:layout_alignParentBottom="true"
-            android:layout_alignParentRight="true"/>
+            android:layout_alignParentRight="true"
+            android:padding="@dimen/theme_option_sample_padding"/>
     </RelativeLayout>
 </LinearLayout>