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

Commit 6208c155 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix some layout issues in notification guts" into rvc-dev am: 426f627b am: 74a975e8 

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

Change-Id: I334bee2a8e5c0829071dce001bd880b58593a485
parents 3dadaaf8 74a975e8

packages/SystemUI/res/layout/notification_conversation_info.xml

+5 −5
Original line number Diff line number Diff line
@@ -85,20 +85,20 @@ 
                    style="@style/TextAppearance.NotificationImportanceChannel"/>

            </LinearLayout>

            <TextView

                android:id="@+id/pkg_name"

                android:id="@+id/group_name"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                style="@style/TextAppearance.NotificationImportanceChannelGroup"

                android:ellipsize="end"

                android:textDirection="locale"

                android:maxLines="1"/>

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

            <TextView

                android:id="@+id/group_name"

                android:id="@+id/pkg_name"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                style="@style/TextAppearance.NotificationImportanceApp"

                android:ellipsize="end"

                android:textDirection="locale"

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

                android:maxLines="1"/>

            <TextView

                android:id="@+id/delegate_name"

                android:layout_width="match_parent"

packages/SystemUI/res/layout/notification_info.xml

+7 −7
Original line number Diff line number Diff line
@@ -59,20 +59,20 @@ 
                android:textDirection="locale"

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

            <TextView

                android:id="@+id/pkg_name"

                android:id="@+id/group_name"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                style="@style/TextAppearance.NotificationImportanceChannelGroup"

                android:ellipsize="end"

                android:textDirection="locale"

                android:maxLines="1"/>

                android:ellipsize="end"

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

            <TextView

                android:id="@+id/group_name"

                android:id="@+id/pkg_name"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:textDirection="locale"

                style="@style/TextAppearance.NotificationImportanceApp"

                android:ellipsize="end"

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

                android:textDirection="locale"

                android:maxLines="1"/>

            <TextView

                android:id="@+id/delegate_name"

                android:layout_width="match_parent"

packages/SystemUI/res/layout/partial_conversation_info.xml

+4 −1
Original line number Diff line number Diff line
@@ -113,18 +113,21 @@ 
                android:layout_height="wrap_content"

                android:clipChildren="false"

                android:clipToPadding="false"

                android:layout_centerVertical="true"

                android:orientation="horizontal">

                <ImageView

                    android:layout_height="wrap_content"

                    android:layout_height="match_parent"

                    android:layout_width="wrap_content"

                    android:contentDescription="@null"

                    android:src="@drawable/ic_info"

                    android:layout_centerVertical="true"

                    android:tint="?android:attr/textColorPrimary"

                    android:layout_marginEnd="8dp"/>

                <TextView

                    android:id="@+id/non_configurable_text"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:layout_centerVertical="true"

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

            </LinearLayout>

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

packages/SystemUI/res/values/styles.xml

+7 −0
Original line number Diff line number Diff line
@@ -547,6 +547,13 @@ 
    </style>



    <style name="TextAppearance.NotificationImportanceChannelGroup">

        <item name="android:textSize">@dimen/notification_importance_channel_group_text</item>

        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>

        <item name="android:textColor">@color/notification_guts_header_text_color</item>

        <item name="android:textSize">@dimen/notification_importance_channel_group_text</item>

    </style>



    <style name="TextAppearance.NotificationImportanceApp">

        <item name="android:textSize">@dimen/notification_importance_channel_group_text</item>

        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>

        <item name="android:textColor">@color/notification_guts_sub_text_color</item>