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

Commit 4365d066 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android (Google) Code Review
Browse files

Merge "Remove line3 in big notification unless there's text to show." into jb-dev

parents 4323d6ea 916ad91c

core/java/android/app/Notification.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -1670,6 +1670,9 @@ public class Notification implements Parcelable 
                contentView.setTextViewText(R.id.text, overflowText);

                contentView.setTextViewText(R.id.text, overflowText);

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

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

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

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

            } else {

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

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

            }

            }





            return contentView;

            return contentView;
@@ -1812,6 +1815,7 @@ public class Notification implements Parcelable 
            // Remove the content text so line3 only shows if you have a summary

            // Remove the content text so line3 only shows if you have a summary

            final boolean hadThreeLines = (mBuilder.mContentText != null && mBuilder.mSubText != null);

            final boolean hadThreeLines = (mBuilder.mContentText != null && mBuilder.mSubText != null);

            mBuilder.mContentText = null;

            mBuilder.mContentText = null;



            RemoteViews contentView = getStandardView(R.layout.notification_template_big_text);

            RemoteViews contentView = getStandardView(R.layout.notification_template_big_text);

            

            

            if (hadThreeLines) {

            if (hadThreeLines) {

core/res/res/layout/notification_template_big_text.xml

+1 −2
Original line number Original line Diff line number Diff line
@@ -108,9 +108,8 @@ 
                android:textAppearance="@style/TextAppearance.StatusBar.EventContent"

                android:textAppearance="@style/TextAppearance.StatusBar.EventContent"

                android:layout_width="match_parent"

                android:layout_width="match_parent"

                android:layout_height="0dp"

                android:layout_height="0dp"

                android:layout_marginBottom="8dp"

                android:layout_marginBottom="10dp"

                android:layout_marginRight="8dp"

                android:layout_marginRight="8dp"

                android:layout_marginTop="2dp"

                android:singleLine="false"

                android:singleLine="false"

                android:visibility="gone"

                android:visibility="gone"

                android:maxLines="8"

                android:maxLines="8"