Fixed various paddings of the messaging layout

Previously the expand button could run into the header
And the content had no padding at the end.
Also, the content was incorrectly padded when collapsed.

Bug: 150905003
Test: add messagingLayout, observe UI
Change-Id: I3178b21dc8831f986a8249ee1e22aebffff75ef1

1 files changed, 5 insertions, 3 deletions

diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index b54adbb0ea0f..cb9883b3f41d 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -7515,9 +7515,11 @@ public class Notification implements Parcelable
                     p,
                     bindResult);
             addExtras(mBuilder.mN.extras);
-            // also update the end margin if there is an image
-            contentView.setViewLayoutMarginEnd(R.id.notification_messaging,
-                    bindResult.getIconMarginEnd());
+            if (!CONVERSATION_LAYOUT_ENABLED) {
+                // also update the end margin if there is an image
+                contentView.setViewLayoutMarginEnd(R.id.notification_messaging,
+                        bindResult.getIconMarginEnd());
+            }
             contentView.setInt(R.id.status_bar_latest_event_content, "setLayoutColor",
                     mBuilder.isColorized(p) ? mBuilder.getPrimaryTextColor(p)
                             : mBuilder.resolveContrastColor(p));