Merge "Defensively reset the default state of layout elements." into jb-dev

Author: cwren

core/java/android/app/Notification.java

@@ -1637,15 +1637,21 @@ protected RemoteViews getStandardView(int layoutId) {
 
             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 @@ private RemoteViews makeBigContentView() {
                 if (str != null && !str.equals("")) {
                     contentView.setViewVisibility(rowIds[i], View.VISIBLE);
                     contentView.setTextViewText(rowIds[i], str);
+                } else {
+                    contentView.setViewVisibility(rowIds[i], View.GONE);
                 }
                 i++;
             }