Merge "Defensively reset the default state of layout elements." into jb-dev (b46f3f67) · Commits · e / os / android_frameworks_base

core/java/android/app/Notification.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -1637,15 +1637,21 @@ public class Notification implements Parcelable

		if (mBuilder.mSubText == null) {
		contentView.setViewVisibility(R.id.line3, View.GONE);
		} else {
		contentView.setViewVisibility(R.id.line3, View.VISIBLE);
		}

		if (mBigContentTitle != null && mBigContentTitle.equals("")) {
		contentView.setViewVisibility(R.id.line1, View.GONE);
		} else {
		contentView.setViewVisibility(R.id.line1, View.VISIBLE);
		}

		if (mSummaryText != null && !mSummaryText.equals("")) {
		contentView.setViewVisibility(R.id.overflow_title, View.VISIBLE);
		contentView.setTextViewText(R.id.overflow_title, mSummaryText);
		} else {
		contentView.setViewVisibility(R.id.overflow_title, View.GONE);
		}

		return contentView;
		@@ -1852,6 +1858,8 @@ public class Notification implements Parcelable
		if (str != null && !str.equals("")) {
		contentView.setViewVisibility(rowIds[i], View.VISIBLE);
		contentView.setTextViewText(rowIds[i], str);
		} else {
		contentView.setViewVisibility(rowIds[i], View.GONE);
		}
		i++;
		}