Defensively reset the default state of layout elements.
Bug: 6500945
Change-Id: Idf7300c44955413e2db26ecbabdef9f67f12f360
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 0c47069..0d19bd1 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -1639,15 +1639,21 @@
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;
@@ -1854,6 +1860,8 @@
if (str != null && !str.equals("")) {
contentView.setViewVisibility(rowIds[i], View.VISIBLE);
contentView.setTextViewText(rowIds[i], str);
+ } else {
+ contentView.setViewVisibility(rowIds[i], View.GONE);
}
i++;
}