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

Commit 3eef4944 authored by Ioana Alexandru's avatar Ioana Alexandru Committed by Android (Google) Code Review
Browse files

Merge "[Notif redesign] Fix text cutoff" into main

parents 1aa93c30 8d0104f7

core/res/res/layout/notification_2025_template_collapsed_base.xml

+1 −9
Original line number Diff line number Diff line
@@ -125,15 +125,7 @@ 
                    android:layout_marginBottom="@dimen/notification_2025_additional_margin"

                    android:minHeight="@dimen/notification_headerless_line_height"

                    >

                    <!-- This is the simplest way to keep this text vertically centered without

                     gravity="center_vertical" which causes jumpiness in expansion animations. -->

                    <include

                        layout="@layout/notification_2025_text"

                        android:layout_width="match_parent"

                        android:layout_height="@dimen/notification_text_height"

                        android:layout_gravity="center_vertical"

                        android:layout_marginTop="0dp"

                        />

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

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



                <include

core/res/res/layout/notification_2025_template_collapsed_call.xml

+1 −9
Original line number Diff line number Diff line
@@ -128,15 +128,7 @@ 
                            android:layout_height="wrap_content"

                            android:minHeight="@dimen/notification_headerless_line_height"

                            >

                            <!-- This is the simplest way to keep this text vertically centered without

                             gravity="center_vertical" which causes jumpiness in expansion animations. -->

                            <include

                                layout="@layout/notification_2025_text"

                                android:layout_width="match_parent"

                                android:layout_height="@dimen/notification_text_height"

                                android:layout_gravity="center_vertical"

                                android:layout_marginTop="0dp"

                                />

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

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

                    </LinearLayout>

core/res/res/layout/notification_2025_template_collapsed_media.xml

+1 −9
Original line number Diff line number Diff line
@@ -126,15 +126,7 @@ 
                    android:layout_marginBottom="@dimen/notification_2025_additional_margin"

                    android:layout_height="@dimen/notification_headerless_line_height"

                    >

                    <!-- This is the simplest way to keep this text vertically centered without

                     gravity="center_vertical" which causes jumpiness in expansion animations. -->

                    <include

                        layout="@layout/notification_template_text"

                        android:layout_width="match_parent"

                        android:layout_height="@dimen/notification_text_height"

                        android:layout_gravity="center_vertical"

                        android:layout_marginTop="0dp"

                        />

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

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



                <include

core/res/res/layout/notification_2025_text.xml

+5 −3
Original line number Diff line number Diff line
@@ -13,14 +13,16 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

<!-- Note that we prefer layout_gravity="center_vertical" over gravity="center_vertical", since the

 latter can cause jumpiness in expansion animations. -->

<com.android.internal.widget.ImageFloatingTextView

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

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

    android:id="@+id/text"

    android:layout_width="match_parent"

    android:layout_height="@dimen/notification_text_height"

    android:layout_gravity="top"

    android:layout_marginTop="@dimen/notification_text_margin_top"

    android:layout_height="wrap_content"

    android:minHeight="@dimen/notification_text_height"

    android:layout_gravity="center_vertical"

    android:ellipsize="end"

    android:fadingEdge="horizontal"

    android:gravity="top"