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

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

Merge changes from topic "presubmit-am-74daf7c195b84a66ae08146119ceca44" into... 

Merge changes from topic "presubmit-am-74daf7c195b84a66ae08146119ceca44" into tm-mainline-prod am: 85da2f98

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



Change-Id: I22940c84fe1970ac833a5855581c66f9e600222a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 41aa2a2c 85da2f98

packages/SystemUI/res/drawable/overlay_button_background.xml

+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">

packages/SystemUI/res/values-night/colors.xml

+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 -->