diff options
author | Tony Mak <tonymak@google.com> | 2017-12-08 11:09:31 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-12-08 11:09:31 +0000 |
commit | b74ac8d3a1454e31ebe1ad9b2e2dc04b2d0e69ee (patch) | |
tree | 0d6df8462764cded3d548418a1a604aa49b986f1 /res | |
parent | a704cac421db5b23eaec22e4b831fff223662b3b (diff) | |
parent | 195f005448f46dd62a6b1866752f1c62c100a50b (diff) | |
download | android_packages_apps_Trebuchet-b74ac8d3a1454e31ebe1ad9b2e2dc04b2d0e69ee.tar.gz android_packages_apps_Trebuchet-b74ac8d3a1454e31ebe1ad9b2e2dc04b2d0e69ee.tar.bz2 android_packages_apps_Trebuchet-b74ac8d3a1454e31ebe1ad9b2e2dc04b2d0e69ee.zip |
Merge "Tab indicator of work tab should be in orange color" into ub-launcher3-master
Diffstat (limited to 'res')
-rw-r--r-- | res/color/all_apps_work_tab_text.xml | 19 | ||||
-rw-r--r-- | res/layout/all_apps.xml | 18 |
2 files changed, 31 insertions, 6 deletions
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 000000000..7279bf87d --- /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 be509edbe..6750c72a4 100644 --- a/res/layout/all_apps.xml +++ b/res/layout/all_apps.xml @@ -52,31 +52,37 @@ android:layout_marginRight="@dimen/all_apps_tabs_side_padding" 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_marginLeft="@dimen/all_apps_tabs_side_padding" android:layout_marginRight="@dimen/all_apps_tabs_side_padding" 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 |