diff options
author | Tony Mak <tonymak@google.com> | 2018-01-30 14:29:25 +0000 |
---|---|---|
committer | Tony Mak <tonymak@google.com> | 2018-02-01 17:16:58 +0000 |
commit | d6947d27293bc3dd0449d448e7a200bf95f2107a (patch) | |
tree | 6b6e4756ab25f5d34e2cd8a408cab0bcd2990f26 /res | |
parent | 1a341002fcd8b6491701f6b7a8583c6e02ee34ba (diff) | |
download | android_packages_apps_Trebuchet-d6947d27293bc3dd0449d448e7a200bf95f2107a.tar.gz android_packages_apps_Trebuchet-d6947d27293bc3dd0449d448e7a200bf95f2107a.tar.bz2 android_packages_apps_Trebuchet-d6947d27293bc3dd0449d448e7a200bf95f2107a.zip |
Ditch work profile orange and use the accent color instead
FIXES: 72804074
Change-Id: If9dfd6eceb6b3d3365c32859d5cc13d6d49be1a0
Diffstat (limited to 'res')
-rw-r--r-- | res/color/all_apps_work_tab_text.xml | 19 | ||||
-rw-r--r-- | res/layout/all_apps_floating_header.xml | 2 | ||||
-rw-r--r-- | res/layout/work_tab_footer.xml | 3 | ||||
-rw-r--r-- | res/values/colors.xml | 2 | ||||
-rw-r--r-- | res/values/styles.xml | 4 |
5 files changed, 2 insertions, 28 deletions
diff --git a/res/color/all_apps_work_tab_text.xml b/res/color/all_apps_work_tab_text.xml deleted file mode 100644 index 7279bf87d..000000000 --- a/res/color/all_apps_work_tab_text.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?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_floating_header.xml b/res/layout/all_apps_floating_header.xml index 166725da3..c4240f80d 100644 --- a/res/layout/all_apps_floating_header.xml +++ b/res/layout/all_apps_floating_header.xml @@ -52,7 +52,7 @@ android:fontFamily="sans-serif-medium" android:text="@string/all_apps_work_tab" android:textAllCaps="true" - android:textColor="@color/all_apps_work_tab_text" + android:textColor="@color/all_apps_tab_text" android:textSize="14sp" /> </com.android.launcher3.allapps.PersonalWorkSlidingTabStrip> </com.android.launcher3.allapps.FloatingHeaderView> diff --git a/res/layout/work_tab_footer.xml b/res/layout/work_tab_footer.xml index dc0fdd4ee..21ff55ebd 100644 --- a/res/layout/work_tab_footer.xml +++ b/res/layout/work_tab_footer.xml @@ -38,8 +38,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:layout_below="@id/work_footer_divider" - android:theme="@style/WorkModeSwitchTheme"/> + android:layout_below="@id/work_footer_divider"/> <TextView android:id="@android:id/title" diff --git a/res/values/colors.xml b/res/values/colors.xml index 4abdfd607..eb207af1e 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -38,6 +38,4 @@ <color name="all_apps_bg_hand_fill">#E5E5E5</color> <color name="all_apps_bg_hand_fill_dark">#9AA0A6</color> - - <color name="work_profile_color">#FF6D00</color> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index c71484182..8cc4743a3 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -168,8 +168,4 @@ <item name="android:colorControlHighlight">#DFE1E5</item> <item name="android:colorForeground">@color/all_apps_bg_hand_fill_dark</item> </style> - - <style name="WorkModeSwitchTheme" parent="@style/LauncherTheme"> - <item name="android:colorAccent">@color/work_profile_color</item> - </style> </resources> |