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

Commit f8488735 authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

Merge "Fix contrast enforcement for RemoteInputView" into nyc-dev 

am: 74610328

* commit '74610328':
  Fix contrast enforcement for RemoteInputView

Change-Id: I1053d3cf78e9cc79e92e5766baa1e0ea140eb64c
parents 0dcd7876 74610328

packages/SystemUI/res/color/remote_input_text.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,6 +16,6 @@ 
  -->



<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:state_enabled="true" android:color="@android:color/white" />

    <item android:state_enabled="true" android:color="@color/remote_input_text_enabled" /> <!-- white -->

    <item android:color="#99ffffff" /> <!-- 60% white -->

</selector>
 
 No newline at end of file

packages/SystemUI/res/values/colors.xml

+1 −0
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ 
    <color name="minimize_dock_shadow_end">#00000000</color>



    <color name="default_remote_input_background">@*android:color/notification_default_color</color>

    <color name="remote_input_text_enabled">#ffffffff</color>

    <color name="remote_input_hint">#99ffffff</color>



    <color name="remote_input_accent">#eeeeee</color>

packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java

+1 −1
Original line number Diff line number Diff line
@@ -873,7 +873,7 @@ public class NotificationContentView extends FrameLayout { 
                    color = mContext.getColor(R.color.default_remote_input_background);

                }

                existing.setBackgroundColor(NotificationColorUtil.ensureTextBackgroundColor(color,

                        mContext.getColor(R.color.remote_input_text),

                        mContext.getColor(R.color.remote_input_text_enabled),

                        mContext.getColor(R.color.remote_input_hint)));



                if (existingPendingIntent != null || existing.isActive()) {