From b024e4d5c520f609b9883e9deb316418e362d7ec Mon Sep 17 00:00:00 2001 From: Brandon Dayauon Date: Fri, 6 Jun 2025 11:31:54 -0700 Subject: [PATCH] GAR - Update AllApps text color and font Update color to onSurface. And font to google sans (flex) which in this case should be variable-title-small since the textsize is 14sp. bug:418937498 Test manually: Before DT: https://hsv.googleplex.com/4949187362816000 Before LT: https://hsv.googleplex.com/5152308714274816 After DT: https://hsv.googleplex.com/6619686841090048 After LT: https://hsv.googleplex.com/6278208621117440 Flag: EXEMPT bug fix Change-Id: Ib0225bcef38353c451e8fdffefcba97655f97ef1 --- .../com/android/launcher3/appprediction/AppsDividerView.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java b/quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java index ea5d5a40b6..4404428f85 100644 --- a/quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java +++ b/quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java @@ -89,7 +89,7 @@ public class AppsDividerView extends View implements FloatingHeaderRow { mStrokeColor = Flags.allAppsBlur() ? Themes.getAttrColor(context, R.attr.bottomSheetDragHandleColor) : context.getColor(R.color.materialColorOutlineVariant); - mAllAppsLabelTextColor = context.getColor(R.color.materialColorOnSurfaceVariant); + mAllAppsLabelTextColor = context.getColor(R.color.materialColorOnSurface); mAccessibilityManager = AccessibilityManager.getInstance(context); setShowAllAppsLabel(!ALL_APPS_VISITED_COUNT.hasReachedMax(context)); @@ -214,7 +214,8 @@ public class AppsDividerView extends View implements FloatingHeaderRow { private Layout getAllAppsLabelLayout() { if (mAllAppsLabelLayout == null) { mPaint.setAntiAlias(true); - mPaint.setTypeface(Typeface.create("google-sans", Typeface.NORMAL)); + mPaint.setTypeface(Typeface.create(Flags.gsfRes() ? "variable-title-small" + : "google-sans", Typeface.NORMAL)); mPaint.setTextSize( getResources().getDimensionPixelSize(R.dimen.all_apps_label_text_size));