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

Commit 97ec1855 authored by Jagrut Desai's avatar Jagrut Desai Committed by Automerger Merge Worker
Browse files

Merge "Android U: GM3 Color Tokens for Taskbar and quickstep" into udc-dev am: 990aef6c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23220591



Change-Id: I700a064f9f891c5d62ae86f5e882d1050e091798
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 100ea1d7 990aef6c

quickstep/res/color/taskbar_nav_icon_dark_color.xml

0 → 100644
+18 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2023 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="@android:color/system_neutral2_700"/>

</selector>

quickstep/res/color/taskbar_nav_icon_light_color.xml

0 → 100644
+18 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2023 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="@android:color/system_neutral2_200"/>

</selector>

quickstep/res/drawable/bg_taskbar_edu_tooltip.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,5 +18,5 @@ 
    android:shape="rectangle">



    <corners android:radius="@dimen/dialogCornerRadius" />

    <solid android:color="?androidprv:attr/colorSurface" />

    <solid android:color="?androidprv:attr/materialColorSurfaceBright"/>

</shape>
 
 No newline at end of file

quickstep/res/drawable/button_taskbar_edu_colored.xml

+2 −3
Original line number Diff line number Diff line
@@ -15,14 +15,13 @@ 
-->



<inset

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

    xmlns:android="http://schemas.android.com/apk/res/android">

    <ripple

        android:color="?android:attr/colorControlHighlight">

        <item>

            <shape android:shape="rectangle">

                <corners android:radius="16dp"/>

                <solid android:color="?androidprv:attr/colorAccentPrimary"/>

                <solid android:color="@color/taskbar_edu_button_color"/>

            </shape>

        </item>

    </ripple>

quickstep/res/values/colors.xml

+0 −4
Original line number Diff line number Diff line
@@ -25,10 +25,6 @@ 


    <!-- Taskbar -->

    <color name="taskbar_nav_icon_selection_ripple">#E0E0E0</color>

    <color name="taskbar_nav_icon_light_color">#ffffff</color>

    <!-- The dark navigation button color is only used in the rare cases that taskbar isn't drawing

    its background and the underlying app has requested dark buttons. -->

    <color name="taskbar_nav_icon_dark_color">#99000000</color>

    <color name="taskbar_stashed_handle_light_color">#EBffffff</color>

    <color name="taskbar_stashed_handle_dark_color">#99000000</color>