Merge "Decorated custom views now behave better if no custom view is set" into nyc-dev (62dfd5fe) · Commits · e / os / android_frameworks_base

core/java/android/app/Notification.java

+8 −8

Original line number	Diff line number	Diff line
		@@ -4580,13 +4580,13 @@ public class Notification implements Parcelable

		private void buildIntoRemoteViewContent(RemoteViews remoteViews,
		RemoteViews customContent) {
		remoteViews.removeAllViews(R.id.notification_main_column);
		if (customContent != null) {
		// Need to clone customContent before adding, because otherwise it can no longer be
		// parceled independently of remoteViews.
		if (customContent != null) {
		customContent = customContent.clone();
		}
		remoteViews.removeAllViews(R.id.notification_main_column);
		remoteViews.addView(R.id.notification_main_column, customContent);
		}
		// also update the end margin if there is an image
		int endMargin = mBuilder.mContext.getResources().getDimensionPixelSize(
		R.dimen.notification_content_margin_end);
		@@ -4689,13 +4689,13 @@ public class Notification implements Parcelable

		private RemoteViews buildIntoRemoteView(RemoteViews remoteViews, int id,
		RemoteViews customContent) {
		remoteViews.removeAllViews(id);
		if (customContent != null) {
		// Need to clone customContent before adding, because otherwise it can no longer be
		// parceled independently of remoteViews.
		if (customContent != null) {
		customContent = customContent.clone();
		}
		remoteViews.removeAllViews(id);
		remoteViews.addView(id, customContent);
		}
		return remoteViews;
		}
		}