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

Commit 539aad45 authored by Dan Sandler's avatar Dan Sandler
Browse files

Large text support for notifications.

Bug: 7216066
Bug: 15437369
Change-Id: I01a07f04c18d374fc1656f0b1f439a7c33c9d80c
parent e2f7f0a5
Loading
Loading
Loading
Loading
+13 −1
Original line number Diff line number Diff line
@@ -2574,9 +2574,21 @@ public class Notification implements Parcelable
        }

        private RemoteViews applyStandardTemplate(int resId, boolean fitIn1U) {
            final boolean largeFontScale
                    = mContext.getResources().getConfiguration().fontScale >= 1.25f;

            Bitmap profileIcon = getProfileBadge();
            RemoteViews contentView = new BuilderRemoteViews(mContext.getPackageName(),
                    mOriginatingUserId, resId);

            if (largeFontScale) {
                // Make a little extra room for the bigger text.
                final int margin = (int) mContext.getResources()
                        .getDimensionPixelSize(R.dimen.notification_large_font_vert_pad);
                contentView.setViewPadding(R.id.line1, 0, margin, 0, 0);
                contentView.setViewPadding(R.id.line3, 0, 0, 0, margin);
            }

            boolean showLine3 = false;
            boolean showLine2 = false;

@@ -3218,7 +3230,7 @@ public class Notification implements Parcelable
        }

        private int getBigTextLayoutResource() {
            return R.layout.notification_template_material_big_text;
            return getBigBaseLayoutResource();
        }

        private int getInboxLayoutResource() {
+2 −1
Original line number Diff line number Diff line
@@ -21,11 +21,12 @@
    android:layout_width="0dp"
    android:layout_height="48dp"
    android:layout_weight="1"
    android:layout_margin="0dp"
    android:gravity="start|center_vertical"
    android:drawablePadding="8dp"
    android:paddingStart="8dp"
    android:textColor="#555555"
    android:textSize="14dp"
    android:textSize="@dimen/notification_text_size"
    android:singleLine="true"
    android:ellipsize="end"
    />
+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@
    android:drawablePadding="8dp"
    android:paddingStart="8dp"
    android:textColor="#555555"
    android:textSize="14dp"
    android:textSize="@dimen/notification_text_size"
    android:singleLine="true"
    android:ellipsize="end"
    android:alpha="0.5"
+11 −90
Original line number Diff line number Diff line
@@ -29,106 +29,27 @@
        />
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"

        android:layout_gravity="fill_vertical"
        android:layout_height="match_parent"
        android:layout_gravity="top"
        android:layout_marginEnd="8dp"
        android:layout_marginStart="@dimen/notification_large_icon_width"
        android:minHeight="@dimen/notification_large_icon_height"
        android:orientation="vertical"
        android:paddingEnd="8dp"
        android:paddingTop="2dp"
        android:paddingBottom="2dp"
        android:gravity="top"
        >
        <LinearLayout
            android:id="@+id/line1"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:paddingTop="6dp"
            android:layout_marginStart="8dp"
            android:orientation="horizontal"
        >
            <TextView android:id="@+id/title"
                android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent.Title"
        <include layout="@layout/notification_template_part_line1"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
                android:singleLine="true"
                android:ellipsize="marquee"
                android:fadingEdge="horizontal"
            android:layout_weight="1"
            />
            <ViewStub android:id="@+id/time"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_weight="0"
                android:visibility="gone"
                android:layout="@layout/notification_template_part_time"
                />
            <ViewStub android:id="@+id/chronometer"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_weight="0"
                android:visibility="gone"
                android:layout="@layout/notification_template_part_chronometer"
                />
        </LinearLayout>
        <TextView android:id="@+id/text2"
            android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent.Line2"
        <include layout="@layout/notification_template_part_line2"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginTop="-2dp"
            android:layout_marginBottom="-2dp"
            android:layout_marginStart="8dp"
            android:singleLine="true"
            android:fadingEdge="horizontal"
            android:ellipsize="marquee"
            android:visibility="gone"
            android:layout_weight="1"
            />
        <ProgressBar
            android:id="@android:id/progress"
        <include layout="@layout/notification_template_part_line3"
            android:layout_width="match_parent"
            android:layout_height="12dp"
            android:layout_marginStart="8dp"
            android:visibility="gone"
            style="@style/Widget.StatusBar.Material.ProgressBar"
            />
        <LinearLayout
            android:id="@+id/line3"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:orientation="horizontal"
            android:gravity="center_vertical"
            android:layout_marginStart="8dp"
            >
            <TextView android:id="@+id/text"
                android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent"
                android:layout_width="0dp"
            android:layout_height="wrap_content"
            android:layout_weight="1"
                android:layout_gravity="center"
                android:singleLine="true"
                android:ellipsize="marquee"
                android:fadingEdge="horizontal"
                />
            <TextView android:id="@+id/info"
                android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent.Info"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="center"
                android:layout_weight="0"
                android:singleLine="true"
                android:gravity="center"
                android:paddingStart="8dp"
            />
            <ImageView android:id="@+id/profile_icon"
                android:layout_width="24dp"
                android:layout_height="24dp"
                android:layout_gravity="center"
                android:layout_weight="0"
                android:layout_marginStart="8dp"
                android:scaleType="centerInside"
                android:visibility="gone"
                />
        </LinearLayout>
    </LinearLayout>
</FrameLayout>
+14 −113
Original line number Diff line number Diff line
@@ -30,124 +30,24 @@
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_gravity="fill_vertical"
        android:minHeight="@dimen/notification_large_icon_height"
        android:orientation="vertical"
        android:gravity="top"
        >
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
        android:layout_gravity="top"
        android:layout_marginEnd="8dp"
        android:layout_marginStart="@dimen/notification_large_icon_width"
        android:minHeight="@dimen/notification_large_icon_height"
            android:paddingTop="2dp"
        android:orientation="vertical"
        >
            <LinearLayout
                android:id="@+id/line1"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:paddingTop="6dp"
                android:layout_marginEnd="8dp"
                android:layout_marginStart="8dp"
                android:orientation="horizontal"
                >
                <TextView android:id="@+id/title"
                    android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent.Title"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:singleLine="true"
                    android:ellipsize="marquee"
                    android:fadingEdge="horizontal"
                    android:layout_weight="1"
                    />
                <ViewStub android:id="@+id/time"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_weight="0"
                    android:visibility="gone"
                    android:layout="@layout/notification_template_part_time"
                    />
                <ViewStub android:id="@+id/chronometer"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_weight="0"
                    android:visibility="gone"
                    android:layout="@layout/notification_template_part_chronometer"
                    />
            </LinearLayout>
            <TextView android:id="@+id/text2"
                android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent.Line2"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_marginTop="-2dp"
                android:layout_marginBottom="-2dp"
                android:layout_marginStart="8dp"
                android:layout_marginEnd="8dp"
                android:singleLine="true"
                android:fadingEdge="horizontal"
                android:ellipsize="marquee"
                android:visibility="gone"
                />
        <include layout="@layout/notification_template_part_line1" />
        <include layout="@layout/notification_template_part_line2" />
        <TextView android:id="@+id/big_text"
            android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
                android:layout_marginStart="8dp"
                android:layout_marginEnd="8dp"
                android:singleLine="false"
                android:visibility="gone"
                />
            <LinearLayout
                android:id="@+id/line3"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_marginStart="8dp"
                android:layout_marginEnd="8dp"
                android:orientation="horizontal"
                android:gravity="center_vertical"
                >
                <TextView android:id="@+id/text"
                    android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent"
                    android:layout_width="0dp"
                    android:layout_height="wrap_content"
            android:minHeight="@dimen/notification_large_icon_height"
            android:layout_weight="1"
                    android:layout_gravity="center"
                    android:singleLine="true"
                    android:ellipsize="marquee"
                    android:fadingEdge="horizontal"
                    />
                <TextView android:id="@+id/info"
                    android:textAppearance="@style/TextAppearance.StatusBar.Material.EventContent.Info"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_gravity="center"
                    android:layout_weight="0"
                    android:singleLine="true"
                    android:gravity="center"
                    android:paddingStart="8dp"
                    />
                <ImageView android:id="@+id/profile_icon"
                    android:layout_width="24dp"
                    android:layout_height="24dp"
                    android:layout_gravity="center"
                    android:layout_weight="0"
                    android:layout_marginStart="8dp"
                    android:scaleType="centerInside"
                    android:visibility="gone"
                    />
            </LinearLayout>
            <ProgressBar
                android:id="@android:id/progress"
                android:layout_width="match_parent"
                android:layout_height="12dp"
                android:layout_marginBottom="8dp"
                android:layout_marginStart="8dp"
                android:layout_marginEnd="8dp"
            android:singleLine="false"
            android:visibility="gone"
                style="@style/Widget.StatusBar.Material.ProgressBar"
            />
        </LinearLayout>
        <include layout="@layout/notification_template_part_line3" />
        <ImageView
            android:layout_width="match_parent"
            android:layout_height="1dp"
@@ -156,9 +56,10 @@
            android:background="@drawable/list_divider_holo_light" />
        <include
            layout="@layout/notification_material_action_list"
            android:layout_marginLeft="-8dp"
            android:layout_marginRight="-8dp"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginStart="@dimen/notification_large_icon_width"
            />
    </LinearLayout>
</FrameLayout>
Loading