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

Commit 07519174 authored by Randy Pfohl's avatar Randy Pfohl Committed by Automerger Merge Worker
Browse files

Merge "Updating overview colors to utilize new tokens" into udc-dev am: f6b74f15 

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



Change-Id: I18e78d1e2c97fa39ec814dcaa5b10e8becfc8b78
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 63144d9a f6b74f15

quickstep/res/color/menu_item_hover_state_color.xml

+2 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

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

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

    <item android:state_hovered="false" android:color="?androidprv:attr/colorSurface" />

    <item android:state_hovered="true" android:color="?androidprv:attr/colorSurfaceVariant" />

    <item android:state_hovered="false" android:color="?androidprv:attr/materialColorSurfaceBright" />

    <item android:state_hovered="true" android:color="?androidprv:attr/materialColorSurfaceVariant" />

</selector>
 
 No newline at end of file

quickstep/res/drawable/bg_overview_clear_all_button.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
        <shape android:shape="rectangle"

            android:tint="?colorButtonNormal">

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

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

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

        </shape>

    </item>

</ripple>
 
 No newline at end of file

quickstep/res/drawable/bg_wellbeing_toast.xml

+2 −2
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
     limitations under the License.

-->

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

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

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

    android:shape="rectangle">

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

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

    <corners android:radius="?android:attr/dialogCornerRadius" />

</shape>
 
 No newline at end of file

quickstep/res/drawable/keyboard_quick_switch_view_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,6 +16,6 @@ 
<shape

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

    android:shape="rectangle">

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

    <solid android:color="?attr/overviewScrimColor" />

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

</shape>

quickstep/res/layout/digital_wellbeing_toast.xml

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
-->

<TextView

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

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

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

    style="@style/TextTitle"

    android:layout_width="match_parent"

    android:layout_height="48dp"
@@ -24,7 +24,7 @@ 
    android:forceHasOverlappingRendering="false"

    android:gravity="center"

    android:importantForAccessibility="noHideDescendants"

    android:textColor="?priv-android:attr/textColorOnAccent"

    android:textColor="?androidprv:attr/materialColorOnSecondaryFixed"

    android:textSize="14sp"

    android:autoSizeTextType="uniform"

    android:autoSizeMaxTextSize="14sp"/>
 
 No newline at end of file