From 20e3381a073ce72ab6512ac92cab13310bed452c Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Mon, 5 Apr 2021 13:27:58 -0400
Subject: [PATCH] Add elevation to toast

Test: manual
Fixes: 184380110
Change-Id: I0c6c0ba9a9ecc40112ceaf7ce3a9093eaaa08015
---
 core/res/res/layout/transient_notification.xml | 1 +
 core/res/res/values/dimens.xml                 | 4 +++-
 packages/SystemUI/res/layout/text_toast.xml    | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/res/res/layout/transient_notification.xml b/core/res/res/layout/transient_notification.xml
index 8fcb77ff4ebd6..8a3d73491af37 100644
--- a/core/res/res/layout/transient_notification.xml
+++ b/core/res/res/layout/transient_notification.xml
@@ -26,6 +26,7 @@
     android:gravity="center_vertical"
     android:maxWidth="@dimen/toast_width"
     android:background="?android:attr/toastFrameBackground"
+    android:elevation="@dimen/toast_elevation"
     android:layout_marginEnd="16dp"
     android:layout_marginStart="16dp"
     android:paddingStart="16dp"
diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml
index cf5b4e1558f9a..fc2645c7c88b3 100644
--- a/core/res/res/values/dimens.xml
+++ b/core/res/res/values/dimens.xml
@@ -30,12 +30,14 @@
          will be displayed in the app launcher and elsewhere. -->
     <dimen name="app_icon_size">48dip</dimen>
 
-    <!--  Offset from the bottom of the device a toast shows -->
+    <!-- Offset from the bottom of the device a toast shows -->
     <dimen name="toast_y_offset">48dp</dimen>
     <!-- Max width of a toast -->
     <dimen name="toast_width">300dp</dimen>
     <!-- Text size of the message within a toast -->
     <dimen name="toast_text_size">14sp</dimen>
+    <!-- Elevation of toast view -->
+    <dimen name="toast_elevation">6dp</dimen>
 
     <!-- Height of the status bar -->
     <dimen name="status_bar_height">@dimen/status_bar_height_portrait</dimen>
diff --git a/packages/SystemUI/res/layout/text_toast.xml b/packages/SystemUI/res/layout/text_toast.xml
index ad558d8053fbf..49b182addd059 100644
--- a/packages/SystemUI/res/layout/text_toast.xml
+++ b/packages/SystemUI/res/layout/text_toast.xml
@@ -24,6 +24,7 @@
     android:gravity="center_vertical"
     android:maxWidth="@*android:dimen/toast_width"
     android:background="@android:drawable/toast_frame"
+    android:elevation="@*android:dimen/toast_elevation"
     android:layout_marginEnd="16dp"
     android:layout_marginStart="16dp"
     android:paddingStart="16dp"