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

Commit a98a27e4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Adjusted the lineHeight for notification texts" into pi-dev

parents a750da19 6555bee8

core/res/res/layout/notification_template_material_big_text.xml

+1 −1
Original line number Diff line number Diff line
@@ -53,10 +53,10 @@ 
                android:layout_marginTop="@dimen/notification_progress_margin_top"

                android:layout_marginBottom="6dp"/>

            <com.android.internal.widget.ImageFloatingTextView android:id="@+id/big_text"

                style="@style/Widget.Material.Notification.Text"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_marginTop="@dimen/notification_text_margin_top"

                android:textAppearance="@style/TextAppearance.Material.Notification"

                android:singleLine="false"

                android:gravity="top"

                android:visibility="gone"

core/res/res/layout/notification_template_material_inbox.xml

+7 −7
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
                android:layout_marginTop="@dimen/notification_progress_margin_top"

                android:layout_marginBottom="2dp"/>

            <TextView android:id="@+id/inbox_text0"

                android:textAppearance="@style/TextAppearance.Material.Notification"

                style="@style/Widget.Material.Notification.Text"

                android:layout_width="match_parent"

                android:layout_height="0dp"

                android:singleLine="true"
@@ -62,7 +62,7 @@ 
                android:layout_weight="1"

                />

            <TextView android:id="@+id/inbox_text1"

                android:textAppearance="@style/TextAppearance.Material.Notification"

                style="@style/Widget.Material.Notification.Text"

                android:layout_width="match_parent"

                android:layout_height="0dp"

                android:singleLine="true"
@@ -71,7 +71,7 @@ 
                android:layout_weight="1"

                />

            <TextView android:id="@+id/inbox_text2"

                android:textAppearance="@style/TextAppearance.Material.Notification"

                style="@style/Widget.Material.Notification.Text"

                android:layout_width="match_parent"

                android:layout_height="0dp"

                android:singleLine="true"
@@ -80,7 +80,7 @@ 
                android:layout_weight="1"

                />

            <TextView android:id="@+id/inbox_text3"

                android:textAppearance="@style/TextAppearance.Material.Notification"

                style="@style/Widget.Material.Notification.Text"

                android:layout_width="match_parent"

                android:layout_height="0dp"

                android:singleLine="true"
@@ -89,7 +89,7 @@ 
                android:layout_weight="1"

                />

            <TextView android:id="@+id/inbox_text4"

                android:textAppearance="@style/TextAppearance.Material.Notification"

                style="@style/Widget.Material.Notification.Text"

                android:layout_width="match_parent"

                android:layout_height="0dp"

                android:singleLine="true"
@@ -98,7 +98,7 @@ 
                android:layout_weight="1"

                />

            <TextView android:id="@+id/inbox_text5"

                android:textAppearance="@style/TextAppearance.Material.Notification"

                style="@style/Widget.Material.Notification.Text"

                android:layout_width="match_parent"

                android:layout_height="0dp"

                android:singleLine="true"
@@ -107,7 +107,7 @@ 
                android:layout_weight="1"

                />

            <TextView android:id="@+id/inbox_text6"

                android:textAppearance="@style/TextAppearance.Material.Notification"

                style="@style/Widget.Material.Notification.Text"

                android:layout_width="match_parent"

                android:layout_height="0dp"

                android:singleLine="true"

core/res/res/layout/notification_template_messaging_group.xml

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
            android:id="@+id/group_message_container"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="@dimen/notification_text_margin_top"

            android:spacing="2dp"

            android:layout_weight="1"/>

    </com.android.internal.widget.RemeasuringLinearLayout>

core/res/res/layout/notification_template_part_line1.xml

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
        android:textAlignment="viewStart"

        />

    <TextView android:id="@+id/text_line_1"

        android:textAppearance="@style/TextAppearance.Material.Notification"

        style="@style/Widget.Material.Notification.Text"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:gravity="end|bottom"

core/res/res/layout/notification_template_text.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
  ~ limitations under the License

  -->

<com.android.internal.widget.ImageFloatingTextView xmlns:android="http://schemas.android.com/apk/res/android"

    style="@style/Widget.Material.Notification.Text"

    android:id="@+id/text"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"
@@ -25,5 +26,4 @@ 
    android:gravity="top"

    android:singleLine="true"

    android:textAlignment="viewStart"

    android:textAppearance="@style/TextAppearance.Material.Notification"

    />