Merge "Don't assume digest lines are GONE, we may be recycling them." into jb-dev

Author: cwren

core/java/android/app/Notification.java

@@ -1852,14 +1852,17 @@ private RemoteViews makeBigContentView() {
             int[] rowIds = {R.id.inbox_text0, R.id.inbox_text1, R.id.inbox_text2, R.id.inbox_text3,
                     R.id.inbox_text4};
 
+            // Make sure all rows are gone in case we reuse a view.
+            for (int rowId : rowIds) {
+                contentView.setViewVisibility(rowId, View.GONE);
+            }
+
             int i=0;
             while (i < mTexts.size() && i < rowIds.length) {
                 CharSequence str = mTexts.get(i);
                 if (str != null && !str.equals("")) {
                     contentView.setViewVisibility(rowIds[i], View.VISIBLE);
                     contentView.setTextViewText(rowIds[i], str);
-                } else {
-                    contentView.setViewVisibility(rowIds[i], View.GONE);
                 }
                 i++;
             }