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

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

Change-Id: I410846f848704b706afb6af4d1b5718cbf0062f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jagrut Desai
2023-05-24 19:05:03 +00:00
committed by Automerger Merge Worker
20 changed files with 129 additions and 52 deletions

View File

@@ -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>

View File

@@ -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>