summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ioana Alexandru <aioana@google.com> 2023-03-08 10:22:05 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-03-08 10:22:05 +0000
commitf5e6aa2a7fcec33f15f55d2479a2edcfbb020367 (patch)
treecb524315d331c9a492ab3e5c4171f75c8d299d05
parent5d4b952b37fc995fd5540f71d83bb3962ce4e18d (diff)
parent2c599da6f9380bcda03ea4978fe01179fcd3e2db (diff)
Merge "Use backgroundColor for the old toast layout." into tm-qpr-dev am: 2c599da6f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21866688 Change-Id: I6ae9fb23597f1effc94328b7097b8da863b48a9e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--core/res/res/layout/transient_notification.xml2
-rw-r--r--core/res/res/layout/transient_notification_with_icon.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/res/res/layout/transient_notification.xml b/core/res/res/layout/transient_notification.xml
index 3259201f6e9b..8bedb897dc19 100644
--- a/core/res/res/layout/transient_notification.xml
+++ b/core/res/res/layout/transient_notification.xml
@@ -25,7 +25,7 @@
android:orientation="horizontal"
android:gravity="center_vertical"
android:maxWidth="@dimen/toast_width"
- android:background="?android:attr/toastFrameBackground"
+ android:background="?android:attr/colorBackground"
android:elevation="@dimen/toast_elevation"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
diff --git a/core/res/res/layout/transient_notification_with_icon.xml b/core/res/res/layout/transient_notification_with_icon.xml
index e9b17df75333..0dfb3adc8364 100644
--- a/core/res/res/layout/transient_notification_with_icon.xml
+++ b/core/res/res/layout/transient_notification_with_icon.xml
@@ -22,7 +22,7 @@
android:orientation="horizontal"
android:gravity="center_vertical"
android:maxWidth="@dimen/toast_width"
- android:background="?android:attr/toastFrameBackground"
+ android:background="?android:attr/colorBackground"
android:elevation="@dimen/toast_elevation"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"