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

Commit ada9f4ae authored by Ioana Alexandru's avatar Ioana Alexandru
Browse files

[Notif redesign] Update promoted notification info design 

I just copied the changes made in notification_2025_info into
promoted_notification_info.

Bug: 394822197
Test: tested manually
Flag: android.app.ui_rich_ongoing
Flag: com.android.systemui.permission_helper_ui_rich_ongoing
Change-Id: I2ed3d72d87e519aaaeaba0bd6d9a100cd1d5a315
parent f6889c5b

packages/SystemUI/res/layout/promoted_notification_info.xml

+97 −106
Original line number Diff line number Diff line
@@ -25,35 +25,29 @@ 
    android:clipChildren="false"

    android:clipToPadding="true"

    android:orientation="vertical"

    android:paddingStart="@dimen/notification_shade_content_margin_horizontal">

    android:paddingStart="@*android:dimen/notification_2025_margin">



    <!-- Package Info -->

    <LinearLayout

        android:id="@+id/header"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:gravity="center_vertical"

        android:clipChildren="false"

        android:paddingTop="@dimen/notification_guts_header_top_padding"

        android:clipToPadding="true">

        <ImageView

            android:id="@+id/pkg_icon"

            android:layout_width="@dimen/notification_guts_conversation_icon_size"

            android:layout_height="@dimen/notification_guts_conversation_icon_size"

            android:layout_centerVertical="true"

            android:layout_alignParentStart="true"

            android:layout_marginEnd="15dp" />

            android:layout_width="@*android:dimen/notification_2025_icon_circle_size"

            android:layout_height="@*android:dimen/notification_2025_icon_circle_size"

            android:layout_marginTop="@*android:dimen/notification_2025_margin"

            android:layout_marginEnd="@*android:dimen/notification_2025_margin" />

        <LinearLayout

            android:id="@+id/names"

            android:layout_weight="1"

            android:layout_width="0dp"

            android:orientation="vertical"

            android:layout_height="wrap_content"

            android:minHeight="@dimen/notification_guts_conversation_icon_size"

            android:layout_centerVertical="true"

            android:gravity="center_vertical"

            android:layout_alignEnd="@id/pkg_icon"

            android:layout_toEndOf="@id/pkg_icon">

            android:layout_marginTop="@*android:dimen/notification_2025_margin"

            android:minHeight="@*android:dimen/notification_2025_icon_circle_size">

            <TextView

                android:id="@+id/channel_name"

                android:layout_width="match_parent"
@@ -79,7 +73,6 @@ 
                android:id="@+id/delegate_name"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_centerVertical="true"

                style="@style/TextAppearance.NotificationImportanceHeader"

                android:layout_marginStart="2dp"

                android:layout_marginEnd="2dp"
@@ -97,23 +90,19 @@ asked for it --> 
            android:id="@+id/app_settings"

            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:tint="@androidprv:color/materialColorPrimary"/>

        <ImageButton

            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:contentDescription="@string/notification_more_settings"

            android:background="@drawable/ripple_drawable_20dp"

            android:src="@drawable/ic_settings"

            android:tint="@androidprv:color/materialColorPrimary"

            android:layout_alignParentEnd="true" />

            android:tint="@androidprv:color/materialColorPrimary" />



    </LinearLayout>
@@ -121,8 +110,8 @@ asked for it --> 
        android:id="@+id/inline_controls"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingEnd="@dimen/notification_shade_content_margin_horizontal"

        android:layout_marginTop="@dimen/notification_guts_option_vertical_padding"

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

        android:layout_marginTop="@*android:dimen/notification_2025_margin"

        android:clipChildren="false"

        android:clipToPadding="false"

        android:orientation="vertical">
@@ -164,33 +153,34 @@ asked for it --> 
                android:id="@+id/automatic"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_marginBottom="@dimen/notification_importance_button_separation"

                android:padding="@dimen/notification_importance_button_padding"

                android:paddingVertical="@dimen/notification_2025_importance_button_padding_vertical"

                android:paddingHorizontal="@dimen/notification_2025_importance_button_padding_horizontal"

                android:gravity="center_vertical"

                android:clickable="true"

                android:focusable="true"

                android:background="@drawable/notification_guts_priority_button_bg"

                android:orientation="vertical"

                android:visibility="gone">

                <LinearLayout

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                android:background="@drawable/notification_2025_guts_priority_button_bg"

                android:orientation="horizontal"

                    android:gravity="center"

                    >

                android:visibility="gone">

                <ImageView

                    android:id="@+id/automatic_icon"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

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

                    android:src="@drawable/ic_notifications_automatic"

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

                    android:tint="@color/notification_guts_priority_contents"

                    android:clickable="false"

                    android:focusable="false"/>

                <LinearLayout

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:orientation="vertical"

                    android:gravity="center"

                    >

                    <TextView

                        android:id="@+id/automatic_label"

                        android:layout_width="0dp"

                        android:layout_height="wrap_content"

                        android:layout_marginStart="@dimen/notification_importance_drawable_padding"

                        android:layout_width="match_parent"

                        android:layout_height="0dp"

                        android:layout_weight="1"

                        android:ellipsize="end"

                        android:maxLines="1"
@@ -198,7 +188,6 @@ asked for it --> 
                        android:focusable="false"

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

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

                </LinearLayout>

                    <TextView

                        android:id="@+id/automatic_summary"

                        android:layout_width="match_parent"
@@ -211,37 +200,40 @@ asked for it --> 
                        android:ellipsize="end"

                        android:maxLines="2"

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

                </LinearLayout>

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



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

                android:id="@+id/alert"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:padding="@dimen/notification_importance_button_padding"

                android:paddingVertical="@dimen/notification_2025_importance_button_padding_vertical"

                android:paddingHorizontal="@dimen/notification_2025_importance_button_padding_horizontal"

                android:gravity="center_vertical"

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

                    android:orientation="horizontal"

                    android:gravity="center"

                    >

                android:background="@drawable/notification_2025_guts_priority_button_bg"

                android:orientation="horizontal">

                <ImageView

                    android:id="@+id/alert_icon"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

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

                    android:src="@drawable/ic_notifications_alert"

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

                    android:tint="@color/notification_guts_priority_contents"

                    android:clickable="false"

                    android:focusable="false"/>

                <LinearLayout

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:orientation="vertical"

                    android:gravity="center"

                    >

                    <TextView

                        android:id="@+id/alert_label"

                        android:layout_width="0dp"

                        android:layout_height="wrap_content"

                        android:layout_marginStart="@dimen/notification_importance_drawable_padding"

                        android:layout_width="match_parent"

                        android:layout_height="0dp"

                        android:layout_weight="1"

                        android:ellipsize="end"

                        android:maxLines="1"
@@ -249,12 +241,10 @@ asked for it --> 
                        android:focusable="false"

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

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

                </LinearLayout>

                    <TextView

                        android:id="@+id/alert_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"
@@ -262,6 +252,7 @@ asked for it --> 
                        android:ellipsize="end"

                        android:maxLines="2"

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

                </LinearLayout>

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



            <com.android.systemui.statusbar.notification.row.ButtonLinearLayout
@@ -269,17 +260,13 @@ asked for it --> 
                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:paddingVertical="@dimen/notification_2025_importance_button_padding_vertical"

                android:paddingHorizontal="@dimen/notification_2025_importance_button_padding_horizontal"

                android:gravity="center_vertical"

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

                    android:orientation="horizontal"

                    android:gravity="center"

                    >

                android:background="@drawable/notification_2025_guts_priority_button_bg"

                android:orientation="horizontal">

                <ImageView

                    android:id="@+id/silence_icon"

                    android:src="@drawable/ic_notifications_silence"
@@ -288,8 +275,15 @@ asked for it --> 
                    android:layout_gravity="center"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

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

                    android:clickable="false"

                    android:focusable="false"/>

                <LinearLayout

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:orientation="vertical"

                    android:gravity="center"

                    >

                    <TextView

                        android:id="@+id/silence_label"

                        android:layout_width="match_parent"
@@ -298,16 +292,12 @@ asked for it --> 
                        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"
@@ -315,6 +305,7 @@ asked for it --> 
                        android:ellipsize="end"

                        android:maxLines="2"

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

                </LinearLayout>

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



        </LinearLayout>