Tab indicator of work tab should be in orange color
Also fix the tab according to the spec.
Fix: 70272233
Change-Id: Ib4a0446d52a8488aadada1b823b3f541c4031d43
diff --git a/res/color/all_apps_work_tab_text.xml b/res/color/all_apps_work_tab_text.xml
new file mode 100644
index 0000000..7279bf8
--- /dev/null
+++ b/res/color/all_apps_work_tab_text.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:color="@color/work_profile_color" android:state_selected="true"/>
+ <item android:color="?android:attr/textColorTertiary"/>
+</selector>
\ No newline at end of file
diff --git a/res/layout/all_apps.xml b/res/layout/all_apps.xml
index 6e91095..73ed38a 100644
--- a/res/layout/all_apps.xml
+++ b/res/layout/all_apps.xml
@@ -50,29 +50,35 @@
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/tabs" />
- <com.android.launcher3.views.SlidingTabStrip
+ <com.android.launcher3.allapps.PersonalWorkSlidingTabStrip
android:id="@+id/tabs"
android:layout_width="match_parent"
android:layout_height="@dimen/all_apps_header_tab_height"
android:layout_below="@id/header_content"
- android:orientation="horizontal" >
+ android:orientation="horizontal">
<Button
android:id="@+id/tab_personal"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
+ android:background="?android:attr/selectableItemBackground"
+ android:fontFamily="sans-serif-medium"
android:text="@string/all_apps_personal_tab"
+ android:textAllCaps="true"
android:textColor="@color/all_apps_tab_text"
- android:background="?android:attr/selectableItemBackground"/>
+ android:textSize="14sp"/>
<Button
android:id="@+id/tab_work"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
+ android:background="?android:attr/selectableItemBackground"
+ android:fontFamily="sans-serif-medium"
android:text="@string/all_apps_work_tab"
- android:textColor="@color/all_apps_tab_text"
- android:background="?android:attr/selectableItemBackground"/>
- </com.android.launcher3.views.SlidingTabStrip>
+ android:textAllCaps="true"
+ android:textColor="@color/all_apps_work_tab_text"
+ android:textSize="14sp"/>
+ </com.android.launcher3.allapps.PersonalWorkSlidingTabStrip>
</com.android.launcher3.allapps.FloatingHeaderView>
<!-- Note: we are reusing/repurposing a system attribute for search layout, because of a