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

Commit 41cdfc0a authored by Jeff DeCew's avatar Jeff DeCew
Browse files

Remove the unneeded icon spacing in the InboxStyle. 

Because the LargeIcon is was moved up a 'line' to
the top of the notification, the only lines which
can intersect it are the header and title lines;
the first line of text from the inbox style no
longer can.  This also sort of depends on
ag/13018219 which fixed the vertical spacing
enough to make this look good.

Bug: 163626038
Test: manual
Change-Id: Ic9ed82eb3c0e9c7e619917351c3461ffe1713857
parent b90803f7

core/java/android/app/Notification.java

+0 −16
Original line number Diff line number Diff line
@@ -8256,8 +8256,6 @@ public class Notification implements Parcelable 
                            mBuilder.processTextSpans(mBuilder.processLegacyText(str)));

                    mBuilder.setTextViewColorSecondary(contentView, rowIds[i], p);

                    contentView.setViewPadding(rowIds[i], 0, topPadding, 0, 0);

                    handleInboxImageMargin(contentView, rowIds[i], first,

                            result.getHeadingFullMarginEnd());

                    if (first) {

                        onlyViewId = rowIds[i];

                    } else {
@@ -8303,20 +8301,6 @@ public class Notification implements Parcelable 
            }

            return false;

        }



        private void handleInboxImageMargin(RemoteViews contentView, int id, boolean first,

                int marginEndValue) {

            int endMargin = 0;

            if (first) {

                final int max = mBuilder.mN.extras.getInt(EXTRA_PROGRESS_MAX, 0);

                final boolean ind = mBuilder.mN.extras.getBoolean(EXTRA_PROGRESS_INDETERMINATE);

                boolean hasProgress = max != 0 || ind;

                if (!hasProgress) {

                    endMargin = marginEndValue;

                }

            }

            contentView.setViewLayoutMarginEnd(id, endMargin);

        }

    }



    /**