Merge "Automated Token Alignment Android/Material" into udc-dev am: d58f413e62

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

Change-Id: I39eed56aed8e671a728cae3601da24df0a996856
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

quickstep/res/drawable/keyboard_quick_switch_overview_button_background.xml

@@ -17,6 +17,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
     android:shape="rectangle">
-    <solid android:color="?androidprv:attr/colorSurfaceVariant" />
+    <solid android:color="?androidprv:attr/materialColorSurfaceContainerHigh" />
     <corners android:radius="@dimen/keyboard_quick_switch_task_view_radius" />
 </shape>

quickstep/res/layout-land/keyboard_quick_switch_taskview.xml

@@ -23,7 +23,7 @@
     android:importantForAccessibility="yes"
     android:background="@drawable/keyboard_quick_switch_task_view_background"
     android:clipToOutline="true"
-    launcher:borderColor="?androidprv:attr/colorAccentSecondaryVariant">
+    launcher:borderColor="?androidprv:attr/materialColorSecondaryContainer">
 
     <include
         layout="@layout/keyboard_quick_switch_thumbnail"

quickstep/res/layout/keyboard_quick_switch_overview.xml

@@ -23,7 +23,7 @@
     android:background="@drawable/keyboard_quick_switch_overview_button_background"
     android:clipToOutline="true"
     android:importantForAccessibility="yes"
-    launcher:borderColor="?androidprv:attr/colorAccentSecondaryVariant">
+    launcher:borderColor="?androidprv:attr/materialColorSecondaryContainer">
 
     <ImageView
         android:id="@+id/icon"

quickstep/res/layout/keyboard_quick_switch_taskview.xml

@@ -23,7 +23,7 @@
     android:importantForAccessibility="yes"
     android:background="@drawable/keyboard_quick_switch_task_view_background"
     android:clipToOutline="true"
-    launcher:borderColor="?androidprv:attr/colorAccentSecondaryVariant">
+    launcher:borderColor="?androidprv:attr/materialColorSecondaryContainer">
 
         <include
             layout="@layout/keyboard_quick_switch_thumbnail"

quickstep/res/layout/task.xml

@@ -24,7 +24,7 @@
     android:clipChildren="false"
     android:defaultFocusHighlightEnabled="false"
     android:focusable="true"
-    launcher:borderColor="?androidprv:attr/colorAccentSecondaryVariant">
+    launcher:borderColor="?androidprv:attr/materialColorSecondaryContainer">
 
     <com.android.quickstep.views.TaskThumbnailView
         android:id="@+id/snapshot"

quickstep/res/layout/task_desktop.xml

@@ -25,7 +25,7 @@
     android:clipToOutline="true"
     android:defaultFocusHighlightEnabled="false"
     android:focusable="true"
-    launcher:borderColor="?androidprv:attr/colorAccentSecondaryVariant">
+    launcher:borderColor="?androidprv:attr/materialColorSecondaryContainer">
 
     <View
         android:id="@+id/background"

quickstep/res/layout/task_grouped.xml

@@ -29,7 +29,7 @@
     android:clipChildren="false"
     android:defaultFocusHighlightEnabled="false"
     android:focusable="true"
-    launcher:borderColor="?androidprv:attr/colorAccentSecondaryVariant">
+    launcher:borderColor="?androidprv:attr/materialColorSecondaryContainer">
 
     <com.android.quickstep.views.TaskThumbnailView
         android:id="@+id/snapshot"