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

Commit 99659495 authored by Yining Liu's avatar Yining Liu Committed by Automerger Merge Worker
Browse files

Merge changes from topic "Notificaiton Large font size UI clippings" into udc-dev am: c740917d 

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



Change-Id: Ib604316e251b312c8619f9b30308072e0f97775f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 75a5167e c740917d

core/res/res/layout/notification_expand_button.xml

+8 −3
Original line number Diff line number Diff line
@@ -19,23 +19,28 @@ 
    android:id="@+id/expand_button"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:minHeight="@dimen/notification_header_height"

    android:layout_gravity="top|end"

    android:contentDescription="@string/expand_button_content_description_collapsed"

    android:padding="16dp"

    android:paddingHorizontal="16dp"

    >



    <LinearLayout

        android:id="@+id/expand_button_pill"

        android:layout_width="wrap_content"

        android:layout_height="@dimen/notification_expand_button_pill_height"

        android:layout_height="wrap_content"

        android:minHeight="@dimen/notification_expand_button_pill_height"

        android:orientation="horizontal"

        android:background="@drawable/expand_button_pill_bg"

        android:gravity="center_vertical"

        android:layout_gravity="center_vertical"

        >



        <TextView

            android:id="@+id/expand_button_number"

            android:layout_width="wrap_content"

            android:layout_height="@dimen/notification_expand_button_pill_height"

            android:layout_height="wrap_content"

            android:minHeight="@dimen/notification_expand_button_pill_height"

            android:textAppearance="@style/TextAppearance.DeviceDefault.Notification.Info"

            android:gravity="center_vertical"

            android:paddingStart="8dp"

core/res/res/layout/notification_template_material_base.xml

+2 −1
Original line number Diff line number Diff line
@@ -79,7 +79,8 @@ 
            <NotificationTopLineView

                android:id="@+id/notification_top_line"

                android:layout_width="wrap_content"

                android:layout_height="@dimen/notification_headerless_line_height"

                android:layout_height="wrap_content"

                android:minHeight="@dimen/notification_headerless_line_height"

                android:clipChildren="false"

                android:theme="@style/Theme.DeviceDefault.Notification"

                >

core/res/res/layout/notification_template_material_call.xml

+7 −2
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@ 
    <LinearLayout

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

        android:layout_width="match_parent"

        android:layout_height="88dp"

        android:layout_height="wrap_content"

        android:minHeight="88dp"

        android:orientation="horizontal"

        >
@@ -41,6 +42,7 @@ 
            android:layout_marginStart="@dimen/conversation_content_start"

            android:orientation="vertical"

            android:minHeight="68dp"

            android:paddingBottom="@dimen/notification_headerless_margin_twoline"

            >



            <include
@@ -49,7 +51,10 @@ 
                android:layout_height="wrap_content"

                />



            <include layout="@layout/notification_template_text" />

            <include layout="@layout/notification_template_text"

                android:layout_height="wrap_content"

                android:minHeight="@dimen/notification_text_height"

                />



        </LinearLayout>

core/res/res/layout/notification_template_material_media.xml

+4 −2
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ 
    android:id="@+id/status_bar_latest_event_content"

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

    android:layout_width="match_parent"

    android:layout_height="@dimen/notification_min_height"

    android:layout_height="wrap_content"

    android:minHeight="@dimen/notification_min_height"

    android:tag="media"

    >
@@ -77,7 +78,8 @@ 
            <NotificationTopLineView

                android:id="@+id/notification_top_line"

                android:layout_width="wrap_content"

                android:layout_height="@dimen/notification_headerless_line_height"

                android:layout_height="wrap_content"

                android:minHeight="@dimen/notification_headerless_line_height"

                android:clipChildren="false"

                android:theme="@style/Theme.DeviceDefault.Notification"

                >

core/res/res/layout/notification_template_material_messaging.xml

+2 −1
Original line number Diff line number Diff line
@@ -102,7 +102,8 @@ 
                    <NotificationTopLineView

                        android:id="@+id/notification_top_line"

                        android:layout_width="wrap_content"

                        android:layout_height="@dimen/notification_headerless_line_height"

                        android:layout_height="wrap_content"

                        android:minHeight="@dimen/notification_headerless_line_height"

                        android:layout_marginStart="@dimen/notification_content_margin_start"

                        android:clipChildren="false"

                        android:theme="@style/Theme.DeviceDefault.Notification"