From ff89c5c9dca1f3fa3608ec9100036c27d401bc38 Mon Sep 17 00:00:00 2001 From: Brandon Dayauon Date: Thu, 1 Feb 2024 12:08:46 -0800 Subject: [PATCH] Fix color contrast in All Apps text by setting the color to onSurfaceVariant bug: 322293478 Test: All Apps divider: before lightTheme: https://drive.google.com/file/d/1MTL1iEX_icYWfT52WeZIgqLK46koLM_s/view?usp=sharing after lightTheme: https://drive.google.com/file/d/1ME1Gk8bUIXIe1P_Z5pvcpi3VS0_L0mVK/view?usp=sharing before darkTheme: https://drive.google.com/file/d/1MLcv32M2JWyVqPklMdZLJAkj8KnyXwtB/view?usp=sharing after darkTheme: https://drive.google.com/file/d/1MJjgP42xgp7SCifHAfREzgWvw6KupvlR/view?usp=sharing All Apps text: before light theme:https://drive.google.com/file/d/1MCu6xtpCMCxtDpnAv3fhCDSafBJGX4rx/view?usp=sharing after light theme:https://drive.google.com/file/d/1M6ilveUw2q0FIlo-NSxt8KEWKRbQvwhk/view?usp=sharing before dark theme:https://drive.google.com/file/d/1MCOxt9MeWxgN65T2s0OKzybiPu4qI4PD/view?usp=sharing after dark theme: https://drive.google.com/file/d/1MAXnRmG8NVMu1bCseVWn6GC2322gQ0sX/view?usp=sharing Flag: None Change-Id: Iedb12d7b11b215c6668e7b5e6637189da3d67ebc --- .../launcher3/appprediction/AppsDividerView.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java b/quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java index 037f7a8fea..694475ae69 100644 --- a/quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java +++ b/quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java @@ -77,19 +77,15 @@ public class AppsDividerView extends View implements FloatingHeaderRow { public AppsDividerView(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); - boolean isMainColorDark = Themes.getAttrBoolean(context, R.attr.isMainColorDark); mDividerSize = new int[]{ getResources().getDimensionPixelSize(R.dimen.all_apps_divider_width), getResources().getDimensionPixelSize(R.dimen.all_apps_divider_height) }; - mStrokeColor = ContextCompat.getColor(context, isMainColorDark - ? R.color.all_apps_prediction_row_separator_dark - : R.color.all_apps_prediction_row_separator); + mStrokeColor = ContextCompat.getColor(context, R.color.material_color_outline_variant); - mAllAppsLabelTextColor = ContextCompat.getColor(context, isMainColorDark - ? R.color.all_apps_label_text_dark - : R.color.all_apps_label_text); + mAllAppsLabelTextColor = ContextCompat.getColor(context, + R.color.material_color_on_surface_variant); mShowAllAppsLabel = !ALL_APPS_VISITED_COUNT.hasReachedMax(context); }