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

Commit 6f024eaa authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Notif redesign] Update color & font of reply textbox" into main

parents 72ebbb5c a4c3af72

packages/SystemUI/res/color/remote_input_hint.xml

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


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

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

    <item android:color="@androidprv:color/materialColorOnSurfaceVariant" android:alpha=".6" />

    <item android:featureFlag="android.app.notifications_redesign_fonts"

        android:color="@androidprv:color/materialColorOnSurface"

        android:alpha=".7" />

    <item android:featureFlag="!android.app.notifications_redesign_fonts"

        android:color="@androidprv:color/materialColorOnSurfaceVariant"

        android:alpha=".6" />

</selector>
 
 No newline at end of file

packages/SystemUI/res/color/remote_input_text.xml

+14 −2
Original line number Diff line number Diff line
@@ -17,6 +17,18 @@ 


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

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

    <item android:state_enabled="false" android:color="@androidprv:color/materialColorOnSurfaceVariant" android:alpha=".6" />

    <item android:color="@androidprv:color/materialColorOnSurfaceVariant" />

    <item android:featureFlag="android.app.notifications_redesign_fonts"

        android:state_enabled="false"

        android:color="@androidprv:color/materialColorOnSurface"

        android:alpha=".7" />

    <item android:featureFlag="!android.app.notifications_redesign_fonts"

        android:state_enabled="false"

        android:color="@androidprv:color/materialColorOnSurfaceVariant"

        android:alpha=".6" />





    <item android:featureFlag="android.app.notifications_redesign_fonts"

        android:color="@androidprv:color/materialColorOnSurface" />

    <item android:featureFlag="!android.app.notifications_redesign_fonts"

        android:color="@androidprv:color/materialColorOnSurfaceVariant" />

</selector>
 
 No newline at end of file

packages/SystemUI/res/layout/remote_input.xml

+37 −17
Original line number Diff line number Diff line
@@ -75,6 +75,26 @@ 
        </FrameLayout>



        <view class="com.android.systemui.statusbar.policy.RemoteInputView$RemoteEditText"

            android:featureFlag="android.app.notifications_redesign_fonts"

            android:id="@+id/remote_input_text"

            android:layout_height="wrap_content"

            android:layout_width="match_parent"

            android:layout_weight="1"

            android:paddingTop="14dp"

            android:paddingStart="4dp"

            android:paddingBottom="16dp"

            android:paddingEnd="12dp"

            android:layout_gravity="start|center_vertical"

            android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification.Reply"

            android:textColor="@color/remote_input_text"

            android:textColorHint="@color/remote_input_hint"

            android:background="@null"

            android:ellipsize="start"

            android:inputType="textShortMessage|textMultiLine|textAutoCorrect|textCapSentences"

            android:imeOptions="actionSend|flagNoExtractUi|flagNoFullscreen" />



        <view class="com.android.systemui.statusbar.policy.RemoteInputView$RemoteEditText"

            android:featureFlag="!android.app.notifications_redesign_fonts"

            android:id="@+id/remote_input_text"

            android:layout_height="wrap_content"

            android:layout_width="match_parent"