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

Commit 4acbf3df authored by Jay Aliomer's avatar Jay Aliomer Committed by Automerger Merge Worker
Browse files

Merge "Inline reply text" into sc-dev am: 93b3622b 

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

Change-Id: Idd21574dbbd1422f6a84c1390cb1b532817b819b
parents 02abf311 93b3622b

packages/SystemUI/res/color/remote_input_send.xml

+2 −2
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:color="#4dffffff" /> <!-- 30% white -->

    <item android:state_enabled="true" android:color="?android:attr/colorAccent" />

    <item android:color="?android:attr/colorAccent" android:alpha=".3" />

</selector>
 
 No newline at end of file

packages/SystemUI/res/color/remote_input_text.xml

+2 −2
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="@color/remote_input_text_enabled" /> <!-- white -->

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

    <item android:state_enabled="true" android:color="?android:attr/textColorTertiary" />

    <item android:color="?android:attr/textColorTertiary" android:alpha=".6" />

</selector>
 
 No newline at end of file

packages/SystemUI/res/layout/remote_input.xml

+6 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
<!-- LinearLayout -->

<com.android.systemui.statusbar.policy.RemoteInputView

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

        android:theme="@style/systemui_theme_remote_input"

        android:id="@+id/remote_input"

        android:layout_height="match_parent"

        android:layout_width="match_parent">
@@ -33,6 +32,10 @@ 
            android:paddingBottom="4dp"

            android:paddingStart="16dp"

            android:paddingEnd="12dp"

            android:layout_marginRight="5dp"

            android:layout_marginLeft="20dp"

            android:layout_marginTop="5dp"

            android:layout_marginBottom="20dp"

            android:gravity="start|center_vertical"

            android:textAppearance="?android:attr/textAppearance"

            android:textColor="@color/remote_input_text"
@@ -53,6 +56,7 @@ 
                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                android:layout_gravity="center"

                android:paddingBottom="20dp"

                android:paddingStart="12dp"

                android:paddingEnd="24dp"

                android:id="@+id/remote_input_send"
@@ -66,6 +70,7 @@ 
                android:id="@+id/remote_input_progress"

                android:layout_width="24dp"

                android:layout_height="24dp"

                android:layout_marginBottom="10dp"

                android:layout_marginEnd="6dp"

                android:layout_gravity="center"

                android:visibility="invisible"

packages/SystemUI/res/values/colors.xml

+1 −2
Original line number Diff line number Diff line
@@ -153,10 +153,9 @@ 
    <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>

    <color name="remote_input_accent">?android:attr/colorAccent</color>



    <color name="quick_step_track_background_background_dark">#1F000000</color>

    <color name="quick_step_track_background_background_light">#33FFFFFF</color>

packages/SystemUI/res/values/styles.xml

+0 −4
Original line number Diff line number Diff line
@@ -384,10 +384,6 @@ 
    <!-- Overridden by values-television/styles.xml with tv-specific settings -->

    <style name="volume_dialog_theme" parent="qs_theme"/>



    <style name="systemui_theme_remote_input" parent="@android:style/Theme.DeviceDefault.Light">

        <item name="android:colorAccent">@color/remote_input_accent</item>

    </style>



    <style name="Theme.SystemUI.Dialog" parent="@android:style/Theme.DeviceDefault.Light.Dialog" />



    <style name="Theme.SystemUI.Dialog.Alert" parent="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert" />