[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
diff --git a/res/drawable/option_color.xml b/res/drawable/option_color.xml
index 87e2532..1fc1837 100644
--- a/res/drawable/option_color.xml
+++ b/res/drawable/option_color.xml
@@ -17,5 +17,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@android:color/black" />
- <corners android:radius="8dp" />
+ <corners android:radius="6dp" />
</shape>
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>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 2bdd26a..bbfb5df 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -20,4 +20,7 @@
<color name="system_navigation_bar_background">@android:color/white</color>
<color name="system_navigation_bar_divider">#1f000000</color>
+
+ <color name="shape_thumbnail_color">#b2b2b2</color>
+ <color name="icon_thumbnail_color">@android:color/black</color>
</resources>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 10a40f0..9405314 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -34,14 +34,14 @@
<!-- Dimensions for the customization option tiles -->
<dimen name="options_container_height">100dp</dimen>
<dimen name="option_tile_width">72dp</dimen>
- <dimen name="option_tile_padding_vertical">16dp</dimen>
+ <dimen name="theme_option_sample_height">23dp</dimen>
+ <dimen name="theme_option_sample_width">23dp</dimen>
+ <dimen name="theme_option_sample_padding">2dp</dimen>
+ <dimen name="option_tile_padding_vertical">12dp</dimen>
<dimen name="option_tile_padding_horizontal">10dp</dimen>
<!-- Note, using dp instead of sp as this text is more like a "snapshot" of the font -->
<dimen name="theme_option_font_text_size">10dp</dimen>
- <dimen name="theme_option_sample_right_width">20dp</dimen>
- <dimen name="theme_option_sample_height">18dp</dimen>
- <dimen name="theme_option_sample_left_width">22dp</dimen>
<dimen name="option_tile_margin_horizontal">4dp</dimen>
<dimen name="theme_option_label_margin">4dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 01bdca1..1e46cad 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -32,7 +32,7 @@
<item name="android:windowNoTitle">true</item>
</style>
- <style name="BottomNavStyle" parent="@style/Widget.MaterialComponents.BottomNavigationView">
+ <style name="BottomNavStyle">
<item name="itemIconTint">@color/bottom_nav_item_color</item>
<item name="itemTextColor">@color/bottom_nav_item_color</item>
<item name="itemTextAppearanceActive">@style/BottomNavTextAppearance</item>