From c7e0c4855080e05a29137915ed1874a7611d1b3a Mon Sep 17 00:00:00 2001 From: Zemiao Zhu Date: Mon, 19 Apr 2021 17:50:05 -0700 Subject: Update colors to use dynamic color for Pixel. Bug: 185831119 Test: manual Change-Id: Ib1d3dc89374d73ff79c1ffd68c330f621e6b79c0 --- res/color/horizontal_breadcrumb_color.xml | 21 +++++++++++++++++++++ res/color/item_doc_grid_border.xml | 4 ++-- res/color/item_doc_grid_tint.xml | 2 +- res/color/item_root_secondary_text.xml | 6 ++++-- res/color/search_chip_ripple_color.xml | 10 +++++----- res/color/search_chip_text_color.xml | 2 +- res/color/sort_list_text.xml | 2 +- res/drawable/ic_briefcase.xml | 2 +- res/drawable/ic_check.xml | 2 +- res/drawable/ic_check_circle.xml | 2 +- res/drawable/ic_dialog_info.xml | 2 +- res/drawable/ic_done.xml | 2 +- res/drawable/list_item_background.xml | 6 +++--- res/layout/directory_header.xml | 4 ++-- res/layout/drawer_layout.xml | 2 +- res/layout/item_doc_grid.xml | 1 + res/layout/item_doc_header_message.xml | 1 + res/layout/item_doc_list.xml | 14 ++++---------- res/layout/navigation_breadcrumb_item.xml | 1 - res/values-night/colors.xml | 6 +----- res/values/colors.xml | 6 +----- res/values/overlayable.xml | 1 + res/values/styles.xml | 1 + res/values/styles_text.xml | 4 ++-- src/com/android/documentsui/BreadcrumbHolder.java | 2 -- .../android/documentsui/HorizontalBreadcrumb.java | 3 +-- .../dirlist/DocumentsSwipeRefreshLayout.java | 4 ++-- 27 files changed, 61 insertions(+), 52 deletions(-) create mode 100644 res/color/horizontal_breadcrumb_color.xml diff --git a/res/color/horizontal_breadcrumb_color.xml b/res/color/horizontal_breadcrumb_color.xml new file mode 100644 index 000000000..d5a852c0a --- /dev/null +++ b/res/color/horizontal_breadcrumb_color.xml @@ -0,0 +1,21 @@ + + + + + + + diff --git a/res/color/item_doc_grid_border.xml b/res/color/item_doc_grid_border.xml index b535aedc3..592d07634 100644 --- a/res/color/item_doc_grid_border.xml +++ b/res/color/item_doc_grid_border.xml @@ -18,10 +18,10 @@ + android:color="?android:attr/colorAccent"/> + android:color="?android:attr/colorAccent"/> diff --git a/res/color/item_doc_grid_tint.xml b/res/color/item_doc_grid_tint.xml index 2c48e9658..878afb175 100644 --- a/res/color/item_doc_grid_tint.xml +++ b/res/color/item_doc_grid_tint.xml @@ -17,7 +17,7 @@ diff --git a/res/color/item_root_secondary_text.xml b/res/color/item_root_secondary_text.xml index 44086ef88..632135ce8 100644 --- a/res/color/item_root_secondary_text.xml +++ b/res/color/item_root_secondary_text.xml @@ -16,8 +16,10 @@ --> - - + + diff --git a/res/color/search_chip_ripple_color.xml b/res/color/search_chip_ripple_color.xml index 985b6cc7d..0f78a0722 100644 --- a/res/color/search_chip_ripple_color.xml +++ b/res/color/search_chip_ripple_color.xml @@ -18,15 +18,15 @@ + android:alpha="0.16" android:color="?android:colorSecondary"/> + android:alpha="0.16" android:color="?android:colorSecondary"/> + android:alpha="0.12" android:color="?android:colorSecondary"/> + android:alpha="0.04" android:color="?android:colorSecondary"/> + android:alpha="0.00" android:color="?android:colorSecondary"/> diff --git a/res/color/search_chip_text_color.xml b/res/color/search_chip_text_color.xml index 432c4e2e9..262bede41 100644 --- a/res/color/search_chip_text_color.xml +++ b/res/color/search_chip_text_color.xml @@ -16,7 +16,7 @@ --> - + \ No newline at end of file diff --git a/res/color/sort_list_text.xml b/res/color/sort_list_text.xml index 16f16a24d..cbe8da6fe 100644 --- a/res/color/sort_list_text.xml +++ b/res/color/sort_list_text.xml @@ -16,7 +16,7 @@ + android:color="?android:attr/colorAccent"/> \ No newline at end of file diff --git a/res/drawable/ic_briefcase.xml b/res/drawable/ic_briefcase.xml index cf979ac1c..64efd18d9 100644 --- a/res/drawable/ic_briefcase.xml +++ b/res/drawable/ic_briefcase.xml @@ -20,6 +20,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/res/drawable/ic_check.xml b/res/drawable/ic_check.xml index a6df08a93..2f02c9a6c 100644 --- a/res/drawable/ic_check.xml +++ b/res/drawable/ic_check.xml @@ -18,7 +18,7 @@ Copyright (C) 2018 The Android Open Source Project android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?android:attr/colorPrimary"> + android:tint="?android:colorControlActivated"> diff --git a/res/drawable/ic_check_circle.xml b/res/drawable/ic_check_circle.xml index 13b45bd8e..62a4e34b4 100644 --- a/res/drawable/ic_check_circle.xml +++ b/res/drawable/ic_check_circle.xml @@ -19,6 +19,6 @@ Copyright (C) 2016 The Android Open Source Project android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_dialog_info.xml b/res/drawable/ic_dialog_info.xml index 2e2447b69..968bb67dd 100644 --- a/res/drawable/ic_dialog_info.xml +++ b/res/drawable/ic_dialog_info.xml @@ -19,7 +19,7 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?android:attr/colorPrimary"> + android:tint="?android:attr/colorAccent"> diff --git a/res/drawable/ic_done.xml b/res/drawable/ic_done.xml index f8f66b692..299bd177f 100644 --- a/res/drawable/ic_done.xml +++ b/res/drawable/ic_done.xml @@ -19,6 +19,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/list_item_background.xml b/res/drawable/list_item_background.xml index afbeecd27..a73ae2e2a 100644 --- a/res/drawable/list_item_background.xml +++ b/res/drawable/list_item_background.xml @@ -16,16 +16,16 @@ - + - + - + \ No newline at end of file diff --git a/res/layout/directory_header.xml b/res/layout/directory_header.xml index b7ab7d96a..6a222d5c3 100644 --- a/res/layout/directory_header.xml +++ b/res/layout/directory_header.xml @@ -46,8 +46,8 @@ app:tabMaxWidth="0dp" app:tabGravity="fill" app:tabMode="fixed" - app:tabIndicatorColor="@color/tab_indicator_color" - app:tabSelectedTextColor="@color/tab_indicator_color" + app:tabIndicatorColor="?android:attr/colorAccent" + app:tabSelectedTextColor="?android:attr/colorAccent" app:tabTextAppearance="@style/TabTextAppearance" app:tabTextColor="?android:attr/textColorSecondary"/> diff --git a/res/layout/drawer_layout.xml b/res/layout/drawer_layout.xml index 7cb185fad..b5bfc66a1 100644 --- a/res/layout/drawer_layout.xml +++ b/res/layout/drawer_layout.xml @@ -88,7 +88,7 @@ android:background="?android:attr/colorBackground" android:elevation="0dp" app:titleTextAppearance="@style/DrawerMenuTitle" - app:titleTextColor="?android:colorPrimary"/> + app:titleTextColor="?android:colorAccent"/> diff --git a/res/layout/item_doc_header_message.xml b/res/layout/item_doc_header_message.xml index 416fbe9c4..4b2cf355f 100644 --- a/res/layout/item_doc_header_message.xml +++ b/res/layout/item_doc_header_message.xml @@ -34,6 +34,7 @@ - - - - #3D8AB4F8 #5F6368 - #669DF6 - #669DF6 @android:color/white @android:color/white @android:color/white - #669DF6 #b3ffffff #36ffffff #9aa0a6 - - #A1C2FA + ?android:colorSecondary diff --git a/res/values/colors.xml b/res/values/colors.xml index 1688bf64f..1a4d3bcee 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -42,18 +42,14 @@ #ff3367d6 #fff5f5f5 - #1A73E8 - #1A73E8 #202124 #757575 - #1A73E8 @android:color/black #5F6368 #613c4043 #1f000000 - - #3367D6 + ?android:colorSecondary diff --git a/res/values/overlayable.xml b/res/values/overlayable.xml index 621de83d4..0b334d222 100644 --- a/res/values/overlayable.xml +++ b/res/values/overlayable.xml @@ -40,6 +40,7 @@ + diff --git a/res/values/styles.xml b/res/values/styles.xml index d35005af2..264f2b4e6 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -85,6 +85,7 @@ @@ -113,7 +113,7 @@ diff --git a/src/com/android/documentsui/BreadcrumbHolder.java b/src/com/android/documentsui/BreadcrumbHolder.java index 68c0e6a0e..4baaf9ca5 100644 --- a/src/com/android/documentsui/BreadcrumbHolder.java +++ b/src/com/android/documentsui/BreadcrumbHolder.java @@ -27,14 +27,12 @@ public final class BreadcrumbHolder extends RecyclerView.ViewHolder { protected TextView mTitle; protected ImageView mArrow; - protected int mDefaultTextColor; protected boolean mLast; public BreadcrumbHolder(View itemView) { super(itemView); mTitle = itemView.findViewById(R.id.breadcrumb_text); mArrow = itemView.findViewById(R.id.breadcrumb_arrow); - mDefaultTextColor = mTitle.getTextColors().getDefaultColor(); mLast = false; } diff --git a/src/com/android/documentsui/HorizontalBreadcrumb.java b/src/com/android/documentsui/HorizontalBreadcrumb.java index 5cfc65e09..94f0e13f9 100644 --- a/src/com/android/documentsui/HorizontalBreadcrumb.java +++ b/src/com/android/documentsui/HorizontalBreadcrumb.java @@ -176,7 +176,6 @@ public final class HorizontalBreadcrumb extends RecyclerView implements Breadcru public void onBindViewHolder(BreadcrumbHolder holder, int position) { final int padding = (int) holder.itemView.getResources() .getDimension(R.dimen.breadcrumb_item_padding); - final int enableColor = holder.itemView.getContext().getColor(R.color.primary); final boolean isFirst = position == 0; // Note that when isFirst is true, there might not be a DocumentInfo on the stack as it // could be an error state screen accessible from the root info. @@ -184,7 +183,7 @@ public final class HorizontalBreadcrumb extends RecyclerView implements Breadcru holder.mTitle.setText( isFirst ? mEnv.getCurrentRoot().title : mState.stack.get(position).displayName); - holder.mTitle.setTextColor(isLast ? enableColor : holder.mDefaultTextColor); + holder.mTitle.setEnabled(isLast); holder.mTitle.setPadding(isFirst ? padding * 3 : padding, padding, isLast ? padding * 2 : padding, padding); holder.mArrow.setVisibility(isLast ? View.GONE : View.VISIBLE); diff --git a/src/com/android/documentsui/dirlist/DocumentsSwipeRefreshLayout.java b/src/com/android/documentsui/dirlist/DocumentsSwipeRefreshLayout.java index a1963645b..4b66b857f 100644 --- a/src/com/android/documentsui/dirlist/DocumentsSwipeRefreshLayout.java +++ b/src/com/android/documentsui/dirlist/DocumentsSwipeRefreshLayout.java @@ -42,12 +42,12 @@ public class DocumentsSwipeRefreshLayout extends SwipeRefreshLayout { public DocumentsSwipeRefreshLayout(Context context, AttributeSet attrs) { super(context, attrs); - final int[] styledAttrs = {android.R.attr.colorPrimary}; + final int[] styledAttrs = {android.R.attr.colorAccent}; TypedArray a = context.obtainStyledAttributes(styledAttrs); @ColorRes int colorId = a.getResourceId(0, -1); if (colorId == -1) { - Log.w(TAG, "Retrive colorPrimary colorId from theme fail, assign R.color.primary"); + Log.w(TAG, "Retrieve colorAccent colorId from theme fail, assign R.color.primary"); colorId = R.color.primary; } a.recycle(); -- cgit v1.2.3-59-g8ed1b