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

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

Merge "Text gets 2 lines for Standard expanded and BigPicture notifications."

parents 0c423bee d14d72f6
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@

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

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

                <include
                    android:layout_width="match_parent"
+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@
                android:layout_marginTop="@dimen/notification_progress_margin_top"
                />

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

        <ImageView
+30 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?><!--
  ~ Copyright (C) 2020 The Android Open Source Project
  ~
  ~ Licensed under the Apache License, Version 2.0 (the "License");
  ~ you may not use this file except in compliance with the License.
  ~ You may obtain a copy of the License at
  ~
  ~      http://www.apache.org/licenses/LICENSE-2.0
  ~
  ~ Unless required by applicable law or agreed to in writing, software
  ~ distributed under the License is distributed on an "AS IS" BASIS,
  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  ~ See the License for the specific language governing permissions and
  ~ limitations under the License
  -->
<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="wrap_content"
    android:layout_gravity="top"
    android:layout_marginTop="@dimen/notification_text_margin_top"
    android:minHeight="@dimen/notification_text_height"
    android:ellipsize="marquee"
    android:fadingEdge="horizontal"
    android:gravity="top"
    android:maxLines="2"
    android:textAlignment="viewStart"
    />