Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0772883f authored by Miranda Kephart's avatar Miranda Kephart Committed by Automerger Merge Worker
Browse files

Merge "Fix button ripple colors for screenshot/clipboard overlay" into tm-dev...

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

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



Change-Id: I4238d5c0dec7b4c9ef00483fbad58c9b71117809
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 339a0e39 fe1292a2
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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">
+0 −1
Original line number Diff line number Diff line
@@ -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 -->