From 3af62c1e25809a835a6b43d86eb32a012ae518ba Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Wed, 12 May 2021 00:29:53 -0700
Subject: [PATCH] Fix white text on light accent color issue for all apps and
 widgets drawer

Bug: 187857897
Bug: 185211063

Test: manual, see screenshot on the bug
Change-Id: Ie7461ce4724c15dafda35a5c533d9539a34d68ab
---
 res/color/all_apps_tab_text.xml            | 2 +-
 res/layout/all_apps_personal_work_tabs.xml | 4 ++--
 res/values/styles.xml                      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/res/color/all_apps_tab_text.xml b/res/color/all_apps_tab_text.xml
index 0c9acf95af..4ddb277163 100644
--- a/res/color/all_apps_tab_text.xml
+++ b/res/color/all_apps_tab_text.xml
@@ -14,6 +14,6 @@
      limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@android:color/white" android:state_selected="true"/>
+    <item android:color="?android:attr/textColorPrimaryInverse" android:state_selected="true"/>
     <item android:color="?android:attr/textColorTertiary"/>
 </selector>
\ No newline at end of file
diff --git a/res/layout/all_apps_personal_work_tabs.xml b/res/layout/all_apps_personal_work_tabs.xml
index cefd0ab72c..750e101b16 100644
--- a/res/layout/all_apps_personal_work_tabs.xml
+++ b/res/layout/all_apps_personal_work_tabs.xml
@@ -35,7 +35,7 @@
         android:background="?android:attr/selectableItemBackground"
         android:text="@string/all_apps_personal_tab"
         android:textColor="@color/all_apps_tab_text"
-        android:textSize="14sp" />
+        android:textSize="16sp" />
 
     <Button
         android:id="@+id/tab_work"
@@ -45,5 +45,5 @@
         android:background="?android:attr/selectableItemBackground"
         android:text="@string/all_apps_work_tab"
         android:textColor="@color/all_apps_tab_text"
-        android:textSize="14sp" />
+        android:textSize="16sp" />
 </com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index dd72114495..8691ad954e 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -195,7 +195,7 @@
         <item name="android:alpha">0</item>
         <item name="android:elevation">3dp</item>
         <item name="android:saveEnabled">false</item>
-        <item name="android:textColor">@android:color/white</item>
+        <item name="android:textColor">?android:attr/textColorPrimaryInverse</item>
         <item name="android:includeFontPadding">false</item>
         <item name="android:importantForAccessibility">no</item>
     </style>