From 08ef694509055b94dc34f1536519d73880dc544b Mon Sep 17 00:00:00 2001 From: Steven Ng Date: Wed, 17 Mar 2021 17:19:52 +0000 Subject: [PATCH] Adjust font, color, margin, corners for all widgets tray Test: manually Bug: 179797520 Change-Id: Ib78aae05e021da272ef2f754c876d24a4c14bcb0 --- res/drawable/ic_expand_less.xml | 2 +- res/drawable/ic_expand_more.xml | 2 +- res/drawable/widgets_list_bottom_ripple.xml | 41 ++++++++++++++++++ res/drawable/widgets_list_middle_ripple.xml | 42 +++++++++++++++++++ res/drawable/widgets_list_top_ripple.xml | 42 +++++++++++++++++++ res/layout/widget_cell_content.xml | 7 ++-- res/layout/widgets_full_sheet.xml | 2 +- ..._full_sheet_search_and_recommendations.xml | 3 +- res/layout/widgets_list_row_header.xml | 5 ++- res/layout/widgets_table_container.xml | 3 +- res/values/dimens.xml | 5 +++ ...WidgetsListHeaderViewHolderBinderTest.java | 15 +++++-- ...sListSearchHeaderViewHolderBinderTest.java | 15 +++++-- .../WidgetsListTableViewHolderBinderTest.java | 11 ++++- .../recyclerview/ViewHolderBinder.java | 2 +- .../widget/picker/WidgetsListAdapter.java | 9 ++-- .../widget/picker/WidgetsListHeader.java | 11 +++++ .../WidgetsListHeaderViewHolderBinder.java | 15 ++++++- ...dgetsListSearchHeaderViewHolderBinder.java | 14 ++++++- .../WidgetsListTableViewHolderBinder.java | 16 ++++++- 20 files changed, 234 insertions(+), 28 deletions(-) create mode 100644 res/drawable/widgets_list_bottom_ripple.xml create mode 100644 res/drawable/widgets_list_middle_ripple.xml create mode 100644 res/drawable/widgets_list_top_ripple.xml diff --git a/res/drawable/ic_expand_less.xml b/res/drawable/ic_expand_less.xml index 8360cee487..cc1608349e 100644 --- a/res/drawable/ic_expand_less.xml +++ b/res/drawable/ic_expand_less.xml @@ -18,7 +18,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24" - android:tint="?android:attr/textColorHint"> + android:tint="?android:attr/textColorSecondary"> diff --git a/res/drawable/ic_expand_more.xml b/res/drawable/ic_expand_more.xml index 49e24f6ba7..ecbce7fa78 100644 --- a/res/drawable/ic_expand_more.xml +++ b/res/drawable/ic_expand_more.xml @@ -18,7 +18,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24" - android:tint="?android:attr/textColorHint"> + android:tint="?android:attr/textColorSecondary"> diff --git a/res/drawable/widgets_list_bottom_ripple.xml b/res/drawable/widgets_list_bottom_ripple.xml new file mode 100644 index 0000000000..3a26091f14 --- /dev/null +++ b/res/drawable/widgets_list_bottom_ripple.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/widgets_list_middle_ripple.xml b/res/drawable/widgets_list_middle_ripple.xml new file mode 100644 index 0000000000..da025d79bb --- /dev/null +++ b/res/drawable/widgets_list_middle_ripple.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/widgets_list_top_ripple.xml b/res/drawable/widgets_list_top_ripple.xml new file mode 100644 index 0000000000..6efc3e1789 --- /dev/null +++ b/res/drawable/widgets_list_top_ripple.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout/widget_cell_content.xml b/res/layout/widget_cell_content.xml index 65a49ab627..50908a49ba 100644 --- a/res/layout/widget_cell_content.xml +++ b/res/layout/widget_cell_content.xml @@ -36,7 +36,7 @@ android:gravity="center_horizontal" android:singleLine="true" android:maxLines="1" - android:textColor="?android:attr/textColorSecondary" + android:textColor="?android:attr/textColorPrimary" android:textSize="14sp" />