commit fdc738f9b8ecdfb11b65c2e4fe0b9c14aee0a626
author Selim Cinek <cinek@google.com> Wed Jan 27 20:04:27 2016 -0800
committer Selim Cinek <cinek@google.com> Thu Jan 28 19:02:21 2016 -0800
tree 30af80bd4ddfd31e21e880e151073a5add11a2f1
parent 0d07c7eccd54661fd26a2f337b5f21c24d9b04ae

Media notifications may not have an icon

Change-Id: Ie47bf144f4add49ec5ed92bb19db39ad116f0678

core/java/android/app/Notification.java

diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 0f3aad9..7f037f2 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -4384,7 +4384,17 @@
                     view.addView(com.android.internal.R.id.media_actions, button);
                 }
             }
-            handleImage(view  /* addPaddingToMainColumn */);
+            handleImage(view);
+            // handle the content margin
+            int endMargin;
+            if (mBuilder.mN.mLargeIcon != null) {
+                endMargin = mBuilder.mContext.getResources().getDimensionPixelSize(
+                        R.dimen.notification_content_picture_margin_media);
+            } else {
+                endMargin = mBuilder.mContext.getResources().getDimensionPixelSize(
+                        R.dimen.notification_content_margin_end);
+            }
+            view.setViewLayoutMarginEnd(R.id.notification_main_column, endMargin);
             return view;
         }