Commit 32e4962e authored by David Trainor's avatar David Trainor Committed by Commit Bot

Update chip styles to snowflake approved values

Update the chip colors/styles to be the snowflake approved styles.  This
currently includes changing the background color, the text color and the
stroke color for chip states.

This patch also updates the padding for the chip list in downloads home
v2 to match spec.

BUG=893915

Change-Id: I7f298542cbe630f6d6b2f02f104b4b5f71f0ba85
Reviewed-on: https://chromium-review.googlesource.com/c/1278987
Commit-Queue: David Trainor <dtrainor@chromium.org>
Reviewed-by: default avatarBecky Zhou <huayinz@chromium.org>
Reviewed-by: default avatarShakti Sahu <shaktisahu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#600021}
parent f743ff5a
...@@ -5,7 +5,18 @@ ...@@ -5,7 +5,18 @@
--> -->
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/google_blue_50" android:state_selected="true" /> <item android:alpha="@dimen/chip_background_disabled_alpha"
<item android:color="@android:color/white" android:state_enabled="true" /> android:color="@color/modern_grey_100"
<item android:color="@color/modern_grey_100" /> android:state_enabled="false" />
<item android:alpha="@dimen/chip_background_selected_focused_alpha"
android:color="@color/modern_blue_600"
android:state_selected="true"
android:state_focused="true" />
<item android:alpha="@dimen/chip_background_selected_alpha"
android:color="@color/modern_blue_600"
android:state_selected="true" />
<item android:alpha="@dimen/chip_background_focused_alpha"
android:color="@color/modern_grey_800"
android:state_focused="true" />
<item android:color="@android:color/white" />
</selector> </selector>
...@@ -5,9 +5,8 @@ ...@@ -5,9 +5,8 @@
--> -->
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/modern_grey_300" <item android:color="@color/hairline_stroke_color"
android:state_enabled="true" android:state_enabled="true"
android:state_pressed="false"
android:state_selected="false" /> android:state_selected="false" />
<item android:color="@android:color/transparent" /> <item android:color="@android:color/transparent" />
</selector> </selector>
...@@ -6,5 +6,5 @@ ...@@ -6,5 +6,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<solid android:color="@color/flush_footer_button_color" /> <solid android:color="@color/flush_footer_button_color" />
<stroke android:width="1dp" android:color="@color/modern_grey_300"/> <stroke android:width="1dp" android:color="@color/hairline_stroke_color"/>
</shape> </shape>
\ No newline at end of file
...@@ -7,6 +7,6 @@ ...@@ -7,6 +7,6 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" > android:shape="rectangle" >
<solid android:color="@android:color/white" /> <solid android:color="@android:color/white" />
<stroke android:width="1dp" android:color="@color/modern_grey_300"/> <stroke android:width="1dp" android:color="@color/hairline_stroke_color"/>
<corners android:radius="@dimen/content_suggestions_card_modern_corner_radius" /> <corners android:radius="@dimen/content_suggestions_card_modern_corner_radius" />
</shape> </shape>
...@@ -532,10 +532,15 @@ ...@@ -532,10 +532,15 @@
<item type="dimen" name="dialog_fixed_height_major">100%</item> <item type="dimen" name="dialog_fixed_height_major">100%</item>
<item type="dimen" name="dialog_fixed_height_minor">100%</item> <item type="dimen" name="dialog_fixed_height_minor">100%</item>
<!-- Chip list dimensions --> <!-- Chip list -->
<dimen name="chip_no_icon_padding">16dp</dimen> <dimen name="chip_no_icon_padding">16dp</dimen>
<dimen name="chip_icon_padding">4dp</dimen> <dimen name="chip_icon_padding">8dp</dimen>
<dimen name="chip_list_padding">2.5dp</dimen> <dimen name="chip_list_inter_chip_padding">2.5dp</dimen>
<dimen name="chip_list_side_padding">16dp</dimen>
<item name="chip_background_disabled_alpha" format="float" type="dimen">0.38</item>
<item name="chip_background_focused_alpha" format="float" type="dimen">0.06</item>
<item name="chip_background_selected_focused_alpha" format="float" type="dimen">0.12</item>
<item name="chip_background_selected_alpha" format="float" type="dimen">0.06</item>
<!-- Download manager dimensions --> <!-- Download manager dimensions -->
<dimen name="download_manager_ideal_image_width">150dp</dimen> <dimen name="download_manager_ideal_image_width">150dp</dimen>
......
...@@ -11,5 +11,5 @@ ...@@ -11,5 +11,5 @@
android:color="@color/white_mode_tint" /> android:color="@color/white_mode_tint" />
<stroke <stroke
android:width="1dp" android:width="1dp"
android:color="@color/modern_grey_300" /> android:color="@color/hairline_stroke_color" />
</shape> </shape>
...@@ -77,10 +77,15 @@ public class ChipsCoordinator implements ChipsProvider.Observer { ...@@ -77,10 +77,15 @@ public class ChipsCoordinator implements ChipsProvider.Observer {
} }
private static class SpaceItemDecoration extends ItemDecoration { private static class SpaceItemDecoration extends ItemDecoration {
private final int mPaddingPx; private final int mInterPaddingPx;
private final int mSidePaddingPx;
public SpaceItemDecoration(Context context) { public SpaceItemDecoration(Context context) {
mPaddingPx = (int) context.getResources().getDimension(R.dimen.chip_list_padding); mInterPaddingPx = (int) context.getResources().getDimensionPixelSize(
R.dimen.chip_list_inter_chip_padding);
mSidePaddingPx = (int) context.getResources().getDimensionPixelSize(
R.dimen.chip_list_side_padding);
;
} }
@Override @Override
...@@ -89,8 +94,8 @@ public class ChipsCoordinator implements ChipsProvider.Observer { ...@@ -89,8 +94,8 @@ public class ChipsCoordinator implements ChipsProvider.Observer {
boolean isFirst = position == 0; boolean isFirst = position == 0;
boolean isLast = position == parent.getAdapter().getItemCount() - 1; boolean isLast = position == parent.getAdapter().getItemCount() - 1;
outRect.left = isFirst ? 2 * mPaddingPx : mPaddingPx; outRect.left = isFirst ? mSidePaddingPx : mInterPaddingPx;
outRect.right = isLast ? 2 * mPaddingPx : mPaddingPx; outRect.right = isLast ? mSidePaddingPx : mInterPaddingPx;
} }
} }
} }
\ No newline at end of file
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
<color name="default_icon_color_white" tools:ignore="UnusedResources"> <color name="default_icon_color_white" tools:ignore="UnusedResources">
@android:color/white @android:color/white
</color> </color>
<color name="hairline_stroke_color" tools:ignore="UnusedResources">@color/modern_grey_300</color>
<!-- Modern color palette --> <!-- Modern color palette -->
<color name="modern_blue_300">#8AB4F8</color> <color name="modern_blue_300">#8AB4F8</color>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment