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

Commit 8eb95542 authored by Jeff DeCew's avatar Jeff DeCew
Browse files

Remove the line1 container for the title 

Bug: 181048615
Test: visual inspection
Change-Id: I5a18f3ac93f9054500d65db606ac6284281123db
parent a9d3e22d

core/java/android/app/Notification.java

+4 −4
Original line number Diff line number Diff line
@@ -5211,7 +5211,7 @@ public class Notification implements Parcelable 
            } else {

                // views in states with a header (big states)

                result.mHeadingExtraMarginSet.applyToView(contentView, R.id.notification_header);

                result.mTitleMarginSet.applyToView(contentView, R.id.line1);

                result.mTitleMarginSet.applyToView(contentView, R.id.title);

            }

        }
@@ -7015,9 +7015,9 @@ public class Notification implements Parcelable 
                    result);



            if (mBigContentTitle != null && mBigContentTitle.equals("")) {

                contentView.setViewVisibility(R.id.line1, View.GONE);

                contentView.setViewVisibility(R.id.title, View.GONE);

            } else {

                contentView.setViewVisibility(R.id.line1, View.VISIBLE);

                contentView.setViewVisibility(R.id.title, View.VISIBLE);

            }



            return contentView;
@@ -9084,7 +9084,7 @@ public class Notification implements Parcelable 


        private void handleImage(RemoteViews contentView) {

            if (mBuilder.mN.hasLargeIcon()) {

                contentView.setViewLayoutMarginDimen(R.id.line1, RemoteViews.MARGIN_END, 0);

                contentView.setViewLayoutMarginDimen(R.id.title, RemoteViews.MARGIN_END, 0);

                contentView.setViewLayoutMarginDimen(R.id.text, RemoteViews.MARGIN_END, 0);

            }

        }

core/res/res/layout/notification_template_material_big_media.xml

+7 −13
Original line number Diff line number Diff line
@@ -59,11 +59,6 @@ 
            <!--<include layout="@layout/notification_template_part_line1"/>-->

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



            <FrameLayout

                android:id="@+id/line1"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                >

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

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

                android:layout_width="match_parent"
@@ -73,7 +68,6 @@ 
                android:fadingEdge="horizontal"

                android:textAlignment="viewStart"

                />

            </FrameLayout>



            <com.android.internal.widget.ImageFloatingTextView

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

core/res/res/layout/notification_template_material_media.xml

+7 −13
Original line number Diff line number Diff line
@@ -63,11 +63,6 @@ 
                <!--<include layout="@layout/notification_template_part_line1"/>-->

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



                <FrameLayout

                    android:id="@+id/line1"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    >

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

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

                    android:layout_width="match_parent"
@@ -77,7 +72,6 @@ 
                    android:fadingEdge="horizontal"

                    android:textAlignment="viewStart"

                    />

                </FrameLayout>



                <com.android.internal.widget.ImageFloatingTextView

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

core/res/res/layout/notification_template_part_line1.xml

+9 −13
Original line number Diff line number Diff line
@@ -15,12 +15,9 @@ 
  ~ limitations under the License

  -->



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

    android:id="@+id/line1"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    >

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

<TextView

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

    android:id="@+id/title"

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"
@@ -29,4 +26,3 @@ 
    android:fadingEdge="horizontal"

    android:textAlignment="viewStart"

    />
 
</FrameLayout>

core/res/res/values/ids.xml

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
  <item type="id" name="icon2" />

  <item type="id" name="input" />

  <item type="id" name="left_icon" />

  <item type="id" name="line1" />

  <item type="id" name="list" />

  <item type="id" name="list_container" />

  <item type="id" name="menu" />