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

Commit 9425bcf9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Conversation inline controls redesign" into rvc-dev am: 0fb37762 am: 8d6f5fbb 

Change-Id: I22a639e51dc36f811c190da0b122aac17067cb27
parents eb6e7740 8d6f5fbb

packages/SystemUI/res/layout/notification_conversation_info.xml

+202 −69
Original line number Diff line number Diff line
@@ -53,8 +53,7 @@ 
            android:layout_centerVertical="true"

            android:gravity="center_vertical"

            android:layout_alignEnd="@id/conversation_icon"

            android:layout_toEndOf="@id/conversation_icon"

            android:layout_alignStart="@id/mute">

            android:layout_toEndOf="@id/conversation_icon">

            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"
@@ -127,96 +126,230 @@ 


        <!-- end aligned fields -->

        <ImageButton

            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:background="@drawable/ripple_drawable"

            android:layout_toStartOf="@id/fave"

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

        <ImageButton

            android:id="@+id/fave"

            android:id="@+id/info"

            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"/>



    </LinearLayout>



    <LinearLayout

        android:id="@+id/actions"

        android:id="@+id/inline_controls"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginEnd="@*android:dimen/notification_content_margin_end"

        android:paddingEnd="@*android:dimen/notification_content_margin_end"

        android:layout_marginTop="@dimen/notification_guts_option_vertical_padding"

        android:clipChildren="false"

        android:clipToPadding="false"

        android:orientation="vertical">



        <View

        <!-- Non configurable app/channel text. appears instead of @+id/interruptiveness_settings-->

        <TextView

            android:id="@+id/non_configurable_text"

            android:text="@string/notification_unblockable_desc"

            android:visibility="gone"

            android:layout_width="match_parent"

            android:layout_height="0.5dp"

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

            android:layout_height="wrap_content"

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



        <Button

            android:id="@+id/snooze"

            android:layout_height="@dimen/notification_guts_conversation_action_height"

        <!-- Non configurable multichannel text. appears instead of @+id/interruptiveness_settings-->

        <TextView

            android:id="@+id/non_configurable_multichannel_text"

            android:text="@string/notification_multichannel_desc"

            android:visibility="gone"

            android:layout_width="match_parent"

            style="?android:attr/borderlessButtonStyle"

            android:text="@string/notification_menu_snooze_action"

            android:gravity="left|center_vertical"

            android:drawableStart="@drawable/ic_snooze"

            android:drawablePadding="@dimen/notification_guts_conversation_action_text_padding_start"

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

            android:layout_height="wrap_content"

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



        <View

        <LinearLayout

            android:id="@+id/interruptiveness_settings"

            android:layout_width="match_parent"

            android:layout_height="0.5dp"

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

            android:layout_height="wrap_content"

            android:gravity="center"

            android:orientation="vertical">



        <Button

            android:id="@+id/bubble"

            android:layout_height="@dimen/notification_guts_conversation_action_height"

            <com.android.systemui.statusbar.notification.row.ButtonLinearLayout

                android:id="@+id/priority"

                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_height="wrap_content"

                android:padding="@dimen/notification_importance_button_padding"

                android:clickable="true"

                android:focusable="true"

                android:background="@drawable/notification_guts_priority_button_bg"

                android:orientation="vertical">

                <LinearLayout

                    android:layout_width="match_parent"

            android:layout_height="0.5dp"

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

        <Button

            android:id="@+id/home"

            android:layout_height="@dimen/notification_guts_conversation_action_height"

                    android:layout_height="wrap_content"

                    android:orientation="horizontal"

                    android:gravity="center"

                >

                    <ImageView

                        android:id="@+id/priority_icon"

                        android:layout_width="wrap_content"

                        android:layout_height="wrap_content"

                        android:src="@drawable/ic_important_outline"

                        android:background="@android:color/transparent"

                        android:tint="@color/notification_guts_priority_contents"

                        android:clickable="false"

                        android:focusable="false"/>

                    <TextView

                        android:id="@+id/priority_label"

                        android:layout_width="0dp"

                        android:layout_height="wrap_content"

                        android:layout_marginStart="@dimen/notification_importance_drawable_padding"

                        android:layout_weight="1"

                        android:ellipsize="end"

                        android:maxLines="1"

                        android:clickable="false"

                        android:focusable="false"

                        android:textAppearance="@style/TextAppearance.NotificationImportanceButton"

                        android:text="@string/notification_priority_title"/>

                </LinearLayout>

                <TextView

                    android:id="@+id/priority_summary"

                    android:layout_width="match_parent"

            style="?android:attr/borderlessButtonStyle"

            android:text="@string/notification_conversation_home_screen"

            android:gravity="left|center_vertical"

            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"/>

                    android:layout_height="wrap_content"

                    android:layout_marginTop="@dimen/notification_importance_button_description_top_margin"

                    android:visibility="gone"

                    android:text="@string/notification_channel_summary_priority"

                    android:clickable="false"

                    android:focusable="false"

                    android:ellipsize="end"

                    android:maxLines="2"

                    android:textAppearance="@style/TextAppearance.NotificationImportanceDetail"/>

            </com.android.systemui.statusbar.notification.row.ButtonLinearLayout>



        <View

            <com.android.systemui.statusbar.notification.row.ButtonLinearLayout

                android:id="@+id/default_behavior"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_marginTop="@dimen/notification_importance_button_separation"

                android:padding="@dimen/notification_importance_button_padding"

                android:clickable="true"

                android:focusable="true"

                android:background="@drawable/notification_guts_priority_button_bg"

                android:orientation="vertical">

                <LinearLayout

                    android:layout_width="match_parent"

            android:layout_height="0.5dp"

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

                    android:layout_height="wrap_content"

                    android:orientation="horizontal"

                    android:gravity="center"

                >

                    <ImageView

                        android:id="@+id/default_icon"

                        android:layout_width="wrap_content"

                        android:layout_height="wrap_content"

                        android:src="@drawable/ic_notifications_alert"

                        android:background="@android:color/transparent"

                        android:tint="@color/notification_guts_priority_contents"

                        android:clickable="false"

                        android:focusable="false"/>

                    <TextView

                        android:id="@+id/default_label"

                        android:layout_width="0dp"

                        android:layout_height="wrap_content"

                        android:layout_marginStart="@dimen/notification_importance_drawable_padding"

                        android:layout_weight="1"

                        android:ellipsize="end"

                        android:maxLines="1"

                        android:clickable="false"

                        android:focusable="false"

                        android:textAppearance="@style/TextAppearance.NotificationImportanceButton"

                        android:text="@string/notification_alert_title"/>

                </LinearLayout>

                <TextView

                    android:id="@+id/default_summary"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:layout_marginTop="@dimen/notification_importance_button_description_top_margin"

                    android:visibility="gone"

                    android:text="@string/notification_channel_summary_default"

                    android:clickable="false"

                    android:focusable="false"

                    android:ellipsize="end"

                    android:maxLines="2"

                    android:textAppearance="@style/TextAppearance.NotificationImportanceDetail"/>

            </com.android.systemui.statusbar.notification.row.ButtonLinearLayout>



        <Button

            android:id="@+id/info"

            android:layout_height="@dimen/notification_guts_conversation_action_height"

            <com.android.systemui.statusbar.notification.row.ButtonLinearLayout

                android:id="@+id/silence"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_marginTop="@dimen/notification_importance_button_separation"

                android:padding="@dimen/notification_importance_button_padding"

                android:clickable="true"

                android:focusable="true"

                android:background="@drawable/notification_guts_priority_button_bg"

                android:orientation="vertical">

                <LinearLayout

                    android:layout_width="match_parent"

            style="?android:attr/borderlessButtonStyle"

            android:drawableStart="@drawable/ic_settings"

            android:text="@string/notification_menu_settings_action"

            android:gravity="left|center_vertical"

            android:drawablePadding="@dimen/notification_guts_conversation_action_text_padding_start"

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

                    android:layout_height="wrap_content"

                    android:orientation="horizontal"

                    android:gravity="center"

                >

                    <ImageView

                        android:id="@+id/silence_icon"

                        android:src="@drawable/ic_notifications_silence"

                        android:background="@android:color/transparent"

                        android:tint="@color/notification_guts_priority_contents"

                        android:layout_gravity="center"

                        android:layout_width="wrap_content"

                        android:layout_height="wrap_content"

                        android:clickable="false"

                        android:focusable="false"/>

                    <TextView

                        android:id="@+id/silence_label"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:ellipsize="end"

                        android:maxLines="1"

                        android:clickable="false"

                        android:focusable="false"

                        android:layout_toEndOf="@id/silence_icon"

                        android:layout_marginStart="@dimen/notification_importance_drawable_padding"

                        android:textAppearance="@style/TextAppearance.NotificationImportanceButton"

                        android:text="@string/notification_silence_title"/>

                </LinearLayout>

                <TextView

                    android:id="@+id/silence_summary"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:layout_marginTop="@dimen/notification_importance_button_description_top_margin"

                    android:visibility="gone"

                    android:text="@string/notification_channel_summary_low"

                    android:clickable="false"

                    android:focusable="false"

                    android:ellipsize="end"

                    android:maxLines="2"

                    android:textAppearance="@style/TextAppearance.NotificationImportanceDetail"/>

            </com.android.systemui.statusbar.notification.row.ButtonLinearLayout>



        </LinearLayout>



        <RelativeLayout

            android:id="@+id/bottom_buttons"

            android:layout_width="match_parent"

            android:layout_height="60dp"

            android:gravity="center_vertical"

            android:paddingStart="4dp"

            android:paddingEnd="4dp"

        >

            <TextView

                android:id="@+id/done"

                android:text="@string/inline_ok_button"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_alignParentEnd="true"

                android:gravity="end|center_vertical"

                android:minWidth="@dimen/notification_importance_toggle_size"

                android:minHeight="@dimen/notification_importance_toggle_size"

                style="@style/TextAppearance.NotificationInfo.Button"/>

        </RelativeLayout>

    </LinearLayout>



</com.android.systemui.statusbar.notification.row.NotificationConversationInfo>

packages/SystemUI/res/layout/notification_info.xml

+1 −2
Original line number Diff line number Diff line
@@ -52,8 +52,7 @@ 
            android:layout_centerVertical="true"

            android:gravity="center_vertical"

            android:layout_alignEnd="@id/pkg_icon"

            android:layout_toEndOf="@id/pkg_icon"

            android:layout_alignStart="@id/mute">

            android:layout_toEndOf="@id/pkg_icon">

            <TextView

                android:id="@+id/channel_name"

                android:layout_width="match_parent"

packages/SystemUI/res/values/strings.xml

+12 −0
Original line number Diff line number Diff line
@@ -1819,6 +1819,18 @@ 
    <!-- [CHAR LIMIT=150] Notification Importance title: bubble level summary -->

    <string name="notification_channel_summary_bubble">Keeps your attention with a floating shortcut to this content.</string>



    <!-- [CHAR LIMIT=150] Notification Importance title: important conversation level summary -->

    <string name="notification_channel_summary_priority">Shows at top of conversation section and appears as a bubble.</string>



    <!--[CHAR LIMIT=150] Conversation inline controls footer shown when all conversations from the app are allowed to show as bubbles -->

    <string name="notification_conversation_channel_all_bubble">All conversations from <xliff:g id="app_name" example="YouTube">%1$s</xliff:g> bubble by default. Manage in <xliff:g id="app_name" example="Settings">%2$s</xliff:g>.</string>



    <!--[CHAR LIMIT=30] Linkable text to Settings app -->

    <string name="notification_conversation_channel_settings">Settings</string>



    <!-- [CHAR LIMIT=150] Notification Importance title: important conversation level -->

    <string name="notification_priority_title">Priority</string>



    <!-- [CHAR LIMIT=NONE] Empty overflow title -->

    <string name="bubble_overflow_empty_title">No recent bubbles</string>

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationConversationInfo.java

+141 −115

File changed.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGutsManager.java

+0 −2
Original line number Diff line number Diff line
@@ -394,7 +394,6 @@ public class NotificationGutsManager implements Dumpable, NotificationLifetimeEx 


        notificationInfoView.bindNotification(

                mShortcutManager,

                mLauncherApps,

                pmUser,

                mNotificationManager,

                mVisualStabilityManager,
@@ -402,7 +401,6 @@ public class NotificationGutsManager implements Dumpable, NotificationLifetimeEx 
                row.getEntry().getChannel(),

                row.getEntry(),

                onSettingsClick,

                onAppSettingsClick,

                onSnoozeClickListener,

                iconFactoryLoader,

                mDeviceProvisionedController.isDeviceProvisioned());