Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac0a5060 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Ditch work profile orange and use the accent color instead" into ub-launcher3-master

parents 6a229962 d6947d27
Loading
Loading
Loading
Loading
+0 −19
Original line number Diff line number Diff line
<?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
+1 −1
Original line number Diff line number Diff line
@@ -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>
+1 −2
Original line number Diff line number Diff line
@@ -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"
+0 −2
Original line number Diff line number Diff line
@@ -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>
+0 −4
Original line number Diff line number Diff line
@@ -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>
Loading