Merge "Fix button ripple colors for screenshot/clipboard overlay" into tm-dev am: 24f2f55b6d am: fe1292a24f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17638183

Change-Id: I4238d5c0dec7b4c9ef00483fbad58c9b71117809
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Miranda Kephart
2022-04-13 10:48:42 +00:00
committed by Automerger Merge Worker
2 changed files with 1 additions and 2 deletions

View File

@@ -18,7 +18,7 @@
(clipboard text editor, long screenshots) -->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:color="?android:textColorPrimary">
android:color="@color/overlay_button_ripple">
<item android:id="@android:id/background">
<inset android:insetTop="4dp" android:insetBottom="4dp">
<shape android:shape="rectangle">

View File

@@ -59,7 +59,6 @@
<color name="global_actions_alert_text">@color/GM2_red_300</color>
<!-- Floating overlay actions -->
<color name="overlay_button_ripple">#42FFFFFF</color>
<color name="overlay_background_protection_start">#80000000</color> <!-- 50% black -->
<!-- Media -->