From c5b7cf9e4e84d5ad9e72b9c1d64e4e969ba26975 Mon Sep 17 00:00:00 2001
From: Pat Manning <patmanning@google.com>
Date: Mon, 20 Nov 2023 13:41:10 +0000
Subject: [PATCH] Add background to app chip menu so elevation shadow renders.

Fix: 312146447
Flag: ACONFIG com.android.launcher3.enable_overview_icon_menu TEAMFOOD
Test: OverviewImageTest.
Change-Id: I43113acd0eaafac2955cd4bbebafc103bdba6d98
---
 quickstep/res/layout/icon_app_chip_view.xml   |  1 +
 quickstep/res/values/dimens.xml               |  2 +-
 .../icon_menu_elevation_background.xml        | 22 +++++++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 res/drawable/icon_menu_elevation_background.xml

diff --git a/quickstep/res/layout/icon_app_chip_view.xml b/quickstep/res/layout/icon_app_chip_view.xml
index 37d5eb22df..fa9fd2bc58 100644
--- a/quickstep/res/layout/icon_app_chip_view.xml
+++ b/quickstep/res/layout/icon_app_chip_view.xml
@@ -23,6 +23,7 @@
     android:focusable="false"
     android:importantForAccessibility="no"
     android:autoMirrored="true"
+    android:background="@drawable/icon_menu_elevation_background"
     android:elevation="@dimen/task_thumbnail_icon_menu_elevation" >
 
     <ImageView
diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index 13a9fff2a7..295074ad29 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -88,7 +88,7 @@
     <dimen name="task_thumbnail_icon_menu_drawable_max_size">32dp</dimen>
     <!--  The size of the icon menu's icon touch target  -->
     <dimen name="task_thumbnail_icon_menu_drawable_touch_size">44dp</dimen>
-    <dimen name="task_thumbnail_icon_menu_elevation">14dp</dimen>
+    <dimen name="task_thumbnail_icon_menu_elevation">4dp</dimen>
 
     <dimen name="task_icon_cache_default_icon_size">72dp</dimen>
     <item name="overview_modal_max_scale" format="float" type="dimen">1.1</item>
diff --git a/res/drawable/icon_menu_elevation_background.xml b/res/drawable/icon_menu_elevation_background.xml
new file mode 100644
index 0000000000..16e3fe26f3
--- /dev/null
+++ b/res/drawable/icon_menu_elevation_background.xml
@@ -0,0 +1,22 @@
+<?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.
+-->
+<shape 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/materialColorSurfaceBright" />
+    <corners android:radius="@dimen/task_thumbnail_icon_menu_corner_radius" />
+</shape>
\ No newline at end of file