[List UI Unification] Basic list unification for phones

chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java

Index: chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java
index 28ece5e1621e96ebe43959410a6de7d909f6503b..451a82a15a579c64d3955403105b20c3f2e12c7f 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java
@@ -18,6 +18,7 @@ import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkItem;
 import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkModelObserver;
 import org.chromium.chrome.browser.bookmarks.BookmarkPromoHeader.PromoHeaderShowingChangeListener;
 import org.chromium.components.bookmarks.BookmarkId;
+import org.chromium.ui.base.DeviceFormFactor;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -77,9 +78,17 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 
         mSections = new ArrayList<>();
         mSections.add(mPromoHeaderSection);
-        mSections.add(mFolderDividerSection);
+
+        if (DeviceFormFactor.isLargeTablet(context)) {

[gone, 2017/02/17 01:45:02]

You should probably just have a function that abstracts this check out.

[Theresa, 2017/02/17 17:34:28]

A function that abstracts whether dividers should be shown? If so, done. If not,
I think the order the sections are added in is important. This is all temporary
so it seems simplest to do the check inline here.

+            mSections.add(mFolderDividerSection);
+        }
+
         mSections.add(mFolderSection);
-        mSections.add(mBookmarkDividerSection);
+
+        if (DeviceFormFactor.isLargeTablet(context)) {
+            mSections.add(mBookmarkDividerSection);
+        }
+
         mSections.add(mBookmarkSection);
     }
 
@@ -143,6 +152,8 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
     }
 
     private void updateDividerSections() {
+        if (!DeviceFormFactor.isLargeTablet(mContext)) return;
+
         mFolderDividerSection.clear();
         mBookmarkDividerSection.clear();
 
@@ -230,9 +241,15 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
                 break;
             case FOLDER_VIEW:
                 ((BookmarkRow) holder.itemView).setBookmarkId(id);
+                ((BookmarkRow) holder.itemView)
+                        .setBackgroundResourceForGroupPosition(id.equals(mFolderSection.get(0)),
+                                id.equals(mFolderSection.get(mFolderSection.size() - 1)));
                 break;
             case BOOKMARK_VIEW:
                 ((BookmarkRow) holder.itemView).setBookmarkId(id);
+                ((BookmarkRow) holder.itemView)
+                        .setBackgroundResourceForGroupPosition(id.equals(mBookmarkSection.get(0)),
+                                id.equals(mBookmarkSection.get(mBookmarkSection.size() - 1)));
                 break;
             default:
                 assert false : "View type not supported!";