From ea4dcf468efe5ef77bedb026efe93fe9f1b58041 Mon Sep 17 00:00:00 2001 From: Samuel Fufa Date: Tue, 4 Feb 2020 12:08:11 -0800 Subject: [PATCH] Add Tests for work profile toggle + Fix minor style issues Bug: 140099753 Bug: 112899690 Test: Manual Change-Id: I1257560be79748abe54a75a74d93caa4390943b5 --- res/layout/work_apps_paused.xml | 10 +-- res/layout/work_tab_footer.xml | 2 + res/values/attrs.xml | 1 + res/values/styles.xml | 3 + .../allapps/AllAppsContainerView.java | 5 ++ .../launcher3/views/WorkFooterContainer.java | 7 +++ .../com/android/launcher3/ui/WorkTabTest.java | 63 ++++++++++++++++--- 7 files changed, 79 insertions(+), 12 deletions(-) diff --git a/res/layout/work_apps_paused.xml b/res/layout/work_apps_paused.xml index 5607e788c4..33502d0bee 100644 --- a/res/layout/work_apps_paused.xml +++ b/res/layout/work_apps_paused.xml @@ -23,14 +23,14 @@ diff --git a/res/layout/work_tab_footer.xml b/res/layout/work_tab_footer.xml index db95416b33..2cffedd2a6 100644 --- a/res/layout/work_tab_footer.xml +++ b/res/layout/work_tab_footer.xml @@ -32,6 +32,8 @@ android:layout_weight="1" android:drawableStart="@drawable/ic_corp" android:drawablePadding="3dp" + android:drawableTint="?attr/workProfileOverlayTextColor" + android:textColor="?attr/workProfileOverlayTextColor" android:layout_height="wrap_content" android:ellipsize="end" android:gravity="center_vertical" diff --git a/res/values/attrs.xml b/res/values/attrs.xml index aef878b63f..5a15ec66cc 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -41,6 +41,7 @@ + diff --git a/res/values/styles.xml b/res/values/styles.xml index 1174a2fdaa..cee268b28d 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -50,6 +50,7 @@ #FF212121 #FF616161 #CCFFFFFF + #FF212121 false false @@ -77,6 +78,7 @@ #CDFFFFFF #FF80868B ?attr/workspaceTextColor +