Support more items in the Notification.InboxStyle, plus an overflow.

Bug: 6500113
Change-Id: I9f6b45ef0821c45000afa8a23ee51033b51df298
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 2eea171..c7afd2b2 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -1850,7 +1850,7 @@
             contentView.setViewVisibility(R.id.text2, View.GONE);
 
             int[] rowIds = {R.id.inbox_text0, R.id.inbox_text1, R.id.inbox_text2, R.id.inbox_text3,
-                    R.id.inbox_text4};
+                    R.id.inbox_text4, R.id.inbox_text5, R.id.inbox_text6};
 
             // Make sure all rows are gone in case we reuse a view.
             for (int rowId : rowIds) {
@@ -1867,6 +1867,12 @@
                 i++;
             }
 
+            if  (mTexts.size() > rowIds.length) {
+                contentView.setViewVisibility(R.id.inbox_more, View.VISIBLE);
+            } else {
+                contentView.setViewVisibility(R.id.inbox_more, View.GONE);
+            }
+
             return contentView;
         }