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

Commit 48a1f984 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Update inline conversation controls"

parents 3651c201 e6fed50a

packages/SystemUI/res/drawable/ic_important.xml

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

<!--

    Copyright (C) 2020 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.

-->

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

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:tint="?attr/colorControlNormal">

    <path

        android:fillColor="@android:color/white"

        android:pathData="M4,18.99h11c0.67,0 1.27,-0.32 1.63,-0.83L21,12l-4.37,-6.16C16.27,5.33 15.67,5 15,5H4l5,7 -5,6.99z"/>

</vector>

packages/SystemUI/res/drawable/ic_important_outline.xml

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

<!--

    Copyright (C) 2020 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.

-->



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

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:tint="?android:attr/colorControlNormal">

    <path

        android:fillColor="@android:color/white"

        android:pathData="M15,19L3,19l4.5,-7L3,5h12c0.65,0 1.26,0.31 1.63,0.84L21,12l-4.37,6.16c-0.37,0.52 -0.98,0.84 -1.63,0.84zM6.5,17L15,17l3.5,-5L15,7L6.5,7l3.5,5 -3.5,5z"/>

</vector>
 
 No newline at end of file

packages/SystemUI/res/drawable/ic_star.xml

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
<!--

  Copyright (C) 2020 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

  -->



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

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="@android:color/white"

        android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27z"/>

</vector>
 
 No newline at end of file

packages/SystemUI/res/drawable/ic_star_border.xml

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
<!--

  Copyright (C) 2020 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

  -->



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

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="@android:color/white"

        android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>

</vector>
 
 No newline at end of file

packages/SystemUI/res/layout/notification_conversation_info.xml

+39 −72
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
    android:paddingStart="@*android:dimen/notification_content_margin_start">



    <!-- Package Info -->

    <RelativeLayout

    <LinearLayout

        android:id="@+id/header"

        android:layout_width="match_parent"

        android:layout_height="@dimen/notification_guts_conversation_header_height"
@@ -41,16 +41,20 @@ 
            android:layout_height="@dimen/notification_guts_conversation_icon_size"

            android:layout_centerVertical="true"

            android:layout_alignParentStart="true"

            android:layout_marginEnd="6dp" />

            android:layout_marginEnd="15dp" />

        <LinearLayout

            android:id="@+id/names"

            android:layout_weight="1"

            android:layout_width="0dp"

            android:orientation="vertical"

            android:layout_width="wrap_content"



            android:layout_height="wrap_content"

            android:minHeight="@dimen/notification_guts_conversation_icon_size"

            android:layout_centerVertical="true"

            android:gravity="center_vertical"

            android:layout_toEndOf="@id/conversation_icon">

            android:layout_alignEnd="@id/conversation_icon"

            android:layout_toEndOf="@id/conversation_icon"

            android:layout_alignStart="@id/mute">

            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"
@@ -107,22 +111,9 @@ 
                    android:layout_weight="1"

                    style="@style/TextAppearance.NotificationImportanceChannel"/>

            </LinearLayout>



        </LinearLayout>



        <TextView

            android:id="@+id/pkg_divider"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_centerVertical="true"

            style="@style/TextAppearance.NotificationImportanceHeader"

            android:layout_marginStart="2dp"

            android:layout_marginEnd="2dp"

            android:layout_toEndOf="@id/name"

            android:text="@*android:string/notification_header_divider_symbol" />

            <TextView

                android:id="@+id/delegate_name"

            android:layout_width="wrap_content"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_centerVertical="true"

                style="@style/TextAppearance.NotificationImportanceHeader"
@@ -133,41 +124,27 @@ 
                android:layout_toEndOf="@id/pkg_divider"

                android:maxLines="1" />



        </LinearLayout>



        <!-- end aligned fields -->

        <ImageButton

            android:id="@+id/demote"

            android:layout_width="@dimen/notification_importance_toggle_size"

            android:layout_height="@dimen/notification_importance_toggle_size"

            android:layout_centerVertical="true"

            android:background="@drawable/ripple_drawable"

            android:contentDescription="@string/demote"

            android:src="@drawable/ic_demote_conversation"

            android:layout_toStartOf="@id/app_settings"

            android:tint="@color/notification_guts_link_icon_tint"/>

        <!-- Optional link to app. Only appears if the channel is not disabled and the app

asked for it -->

        <ImageButton

            android:id="@+id/app_settings"

            android:id="@+id/mute"

            android:layout_width="@dimen/notification_importance_toggle_size"

            android:layout_height="@dimen/notification_importance_toggle_size"

            android:layout_centerVertical="true"

            android:visibility="gone"

            android:background="@drawable/ripple_drawable"

            android:contentDescription="@string/notification_app_settings"

            android:src="@drawable/ic_info"

            android:layout_toStartOf="@id/info"

            android:layout_toStartOf="@id/fave"

            android:tint="@color/notification_guts_link_icon_tint"/>

        <ImageButton

            android:id="@+id/info"

            android:id="@+id/fave"

            android:layout_width="@dimen/notification_importance_toggle_size"

            android:layout_height="@dimen/notification_importance_toggle_size"

            android:layout_centerVertical="true"

            android:background="@drawable/ripple_drawable"

            android:contentDescription="@string/notification_more_settings"

            android:src="@drawable/ic_settings"

            android:layout_alignParentEnd="true"

            android:tint="@color/notification_guts_link_icon_tint"/>

    </RelativeLayout>



    </LinearLayout>



    <LinearLayout

        android:id="@+id/actions"
@@ -182,29 +159,15 @@ asked for it --> 
            android:layout_width="match_parent"

            android:layout_height="0.5dp"

            android:background="@color/GM2_grey_300" />

        <Button

            android:id="@+id/bubble"

            android:layout_height="@dimen/notification_guts_conversation_action_height"

            android:layout_width="match_parent"

            style="?android:attr/borderlessButtonStyle"

            android:text="@string/notification_conversation_favorite"

            android:gravity="left|center_vertical"

            android:drawableStart="@drawable/ic_create_bubble"

            android:drawablePadding="@dimen/notification_guts_conversation_action_text_padding_start"

            android:drawableTint="@color/notification_guts_link_icon_tint"/>



        <View

            android:layout_width="match_parent"

            android:layout_height="0.5dp"

            android:background="@color/GM2_grey_300" />

        <Button

            android:id="@+id/home"

            android:id="@+id/snooze"

            android:layout_height="@dimen/notification_guts_conversation_action_height"

            android:layout_width="match_parent"

            style="?android:attr/borderlessButtonStyle"

            android:text="@string/notification_conversation_home_screen"

            android:text="@string/notification_menu_snooze_action"

            android:gravity="left|center_vertical"

            android:drawableStart="@drawable/ic_add_to_home"

            android:drawableStart="@drawable/ic_snooze"

            android:drawablePadding="@dimen/notification_guts_conversation_action_text_padding_start"

            android:drawableTint="@color/notification_guts_link_icon_tint"/>
@@ -212,12 +175,15 @@ asked for it --> 
            android:layout_width="match_parent"

            android:layout_height="0.5dp"

            android:background="@color/GM2_grey_300" />



        <Button

            android:id="@+id/fave"

            android:id="@+id/bubble"

            android:layout_height="@dimen/notification_guts_conversation_action_height"

            android:layout_width="match_parent"

            style="?android:attr/borderlessButtonStyle"

            android:text="@string/notification_conversation_favorite"

            android:gravity="left|center_vertical"

            android:drawableStart="@drawable/ic_create_bubble"

            android:drawablePadding="@dimen/notification_guts_conversation_action_text_padding_start"

            android:drawableTint="@color/notification_guts_link_icon_tint"/>
@@ -226,13 +192,13 @@ asked for it --> 
            android:layout_height="0.5dp"

            android:background="@color/GM2_grey_300" />

        <Button

            android:id="@+id/snooze"

            android:id="@+id/home"

            android:layout_height="@dimen/notification_guts_conversation_action_height"

            android:layout_width="match_parent"

            style="?android:attr/borderlessButtonStyle"

            android:text="@string/notification_menu_snooze_action"

            android:text="@string/notification_conversation_home_screen"

            android:gravity="left|center_vertical"

            android:drawableStart="@drawable/ic_snooze"

            android:drawableStart="@drawable/ic_add_to_home"

            android:drawablePadding="@dimen/notification_guts_conversation_action_text_padding_start"

            android:drawableTint="@color/notification_guts_link_icon_tint"/>
@@ -240,14 +206,15 @@ asked for it --> 
            android:layout_width="match_parent"

            android:layout_height="0.5dp"

            android:background="@color/GM2_grey_300" />



        <Button

            android:id="@+id/mute"

            android:id="@+id/info"

            android:layout_height="@dimen/notification_guts_conversation_action_height"

            android:layout_width="match_parent"

            style="?android:attr/borderlessButtonStyle"

            android:text="@string/notification_conversation_mute"

            android:drawableStart="@drawable/ic_settings"

            android:text="@string/notification_menu_settings_action"

            android:gravity="left|center_vertical"

            android:drawableStart="@drawable/ic_notifications_silence"

            android:drawablePadding="@dimen/notification_guts_conversation_action_text_padding_start"

            android:drawableTint="@color/notification_guts_link_icon_tint"/>