[List UI Unification] Basic list unification for phones

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.bookmarks;
 
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.RecyclerView.ViewHolder;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.chrome.R;
 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;
 
 /**
  * BaseAdapter for {@link RecyclerView}. It manages bookmarks to list there.
  */
 class BookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> implements
         BookmarkUIObserver, PromoHeaderShowingChangeListener {
     private static final int PROMO_HEADER_VIEW = 0;
@@ skipping 39 matching lines @@
             assert mDelegate != null;
             mDelegate.notifyStateChange(BookmarkItemsAdapter.this);
         }
     };
 
     BookmarkItemsAdapter(Context context) {
         mContext = context;
 
         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);
     }
 
     BookmarkId getItem(int position) {
         return (BookmarkId) getSection(position).get(toSectionPosition(position));
     }
 
     private int toSectionPosition(int globalPosition) {
         int sectionPosition = globalPosition;
         for (List<?> section : mSections) {
@@ skipping 43 matching lines @@
 
         updateHeader();
         updateDividerSections();
 
         // TODO(kkimlabs): Animation is disabled due to a performance issue on bookmark undo.
         //                 http://crbug.com/484174
         notifyDataSetChanged();
     }
 
     private void updateDividerSections() {
+        if (!DeviceFormFactor.isLargeTablet(mContext)) return;
+
         mFolderDividerSection.clear();
         mBookmarkDividerSection.clear();
 
         boolean isHeaderPresent = !mPromoHeaderSection.isEmpty();
 
         if (isHeaderPresent && !mFolderSection.isEmpty()) {
             mFolderDividerSection.add(null);
         }
         if ((isHeaderPresent || !mFolderSection.isEmpty()) && !mBookmarkSection.isEmpty()) {
             mBookmarkDividerSection.add(null);
@@ skipping 67 matching lines @@
     @Override
     public void onBindViewHolder(ViewHolder holder, int position) {
         BookmarkId id = getItem(position);
 
         switch (getItemViewType(position)) {
             case PROMO_HEADER_VIEW:
             case DIVIDER_VIEW:
                 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!";
         }
     }
 
     // PromoHeaderShowingChangeListener implementation.
 
     @Override
     public void onPromoHeaderShowingChanged(boolean isShowing) {
@@ skipping 53 matching lines @@
         if (mPromoHeaderManager.shouldShow()) {
             mPromoHeaderSection.add(null);
         }
     }
 
     @VisibleForTesting
     public BookmarkDelegate getDelegateForTesting() {
         return mDelegate;
     }
 }