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

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

Merge "Inline reply multiline + notif pill" into sc-dev am: 74d4d029 

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

Change-Id: I8da5a6ec8a0855680464394ed2b3ef972c3fddb6
parents 5588d073 74d4d029

packages/SystemUI/res/color/remote_input_hint.xml

0 → 100644
+19 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2021 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



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

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

</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="?android:attr/textColorTertiary" />

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

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

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

</selector>
 
 No newline at end of file

packages/SystemUI/res/drawable/notif_footer_btn_background.xml

0 → 100644
+30 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2021 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



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

    android:shape="rectangle">

    <solid

        android:color="@color/notif_pill_background"

        />

    <corners android:radius="20dp" />



    <padding

        android:left="20dp"

        android:right="20dp">

    </padding>



</shape>
 
 No newline at end of file

packages/SystemUI/res/drawable/remote_input_view_text_bg.xml

0 → 100644
+31 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2021 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

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

    android:shape="rectangle">



    <solid android:color="?android:attr/colorBackgroundFloating" />

    <stroke

        android:width="@dimen/remote_input_view_text_stroke"

        android:color="?android:attr/colorAccent"/>

    <padding

        android:bottom="12dp"

        android:left="12dp"

        android:right="12dp"

        android:top="12dp"/>



    <corners android:radius="24dp" />



</shape>
 
 No newline at end of file

packages/SystemUI/res/layout/remote_input.xml

+12 −14
Original line number Diff line number Diff line
@@ -25,26 +25,25 @@ 


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

            android:id="@+id/remote_input_text"

            android:layout_height="match_parent"

            android:layout_height="wrap_content"

            android:layout_width="0dp"

            android:layout_weight="1"

            android:paddingTop="2dp"

            android:paddingBottom="4dp"

            android:paddingStart="16dp"

            android:paddingEnd="12dp"

            android:layout_marginRight="5dp"

            android:layout_marginRight="20dp"

            android:layout_marginLeft="20dp"

            android:layout_marginTop="5dp"

            android:layout_marginBottom="20dp"

            android:gravity="start|center_vertical"

            android:layout_marginBottom="16dp"

            android:layout_gravity="start|center_vertical"

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

            android:textColor="@color/remote_input_text"

            android:textColorHint="@color/remote_input_hint"

            android:textSize="16sp"

            android:background="@null"

            android:singleLine="true"

            android:maxLines="4"

            android:ellipsize="start"

            android:inputType="textShortMessage|textAutoCorrect|textCapSentences"

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

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



    <FrameLayout
@@ -56,9 +55,9 @@ 
        android:layout_width="wrap_content"

                android:layout_height="match_parent"

                android:layout_gravity="center"

                android:paddingBottom="20dp"

                android:paddingStart="12dp"

                android:paddingEnd="24dp"

                android:paddingLeft="10dp"

                android:layout_marginBottom="12dp"

                android:layout_marginEnd="12dp"

                android:id="@+id/remote_input_send"

                android:src="@drawable/ic_send"

                android:contentDescription="@*android:string/ime_action_send"
@@ -70,9 +69,8 @@ 
                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:layout_marginBottom="12dp"

                android:layout_gravity="center_vertical"

                android:visibility="invisible"

                android:indeterminate="true"

                style="?android:attr/progressBarStyleSmall" />