[Home] Toolbar shadow v1

chrome/android/java/src/org/chromium/chrome/browser/widget/selection/SelectableListLayout.java

 // Copyright 2016 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.widget.selection;
 
 import android.content.Context;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.support.annotation.VisibleForTesting;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.RecyclerView.Adapter;
 import android.support.v7.widget.RecyclerView.AdapterDataObserver;
 import android.support.v7.widget.RecyclerView.ItemAnimator;
 import android.support.v7.widget.RecyclerView.OnScrollListener;
 import android.support.v7.widget.Toolbar;
 import android.support.v7.widget.Toolbar.OnMenuItemClickListener;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewStub;
 import android.widget.FrameLayout;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.util.FeatureUtilities;
 import org.chromium.chrome.browser.widget.FadingShadow;
 import org.chromium.chrome.browser.widget.FadingShadowView;
 import org.chromium.chrome.browser.widget.LoadingView;
 import org.chromium.chrome.browser.widget.displaystyle.DisplayStyleObserver;
 import org.chromium.chrome.browser.widget.displaystyle.HorizontalDisplayStyle;
 import org.chromium.chrome.browser.widget.displaystyle.UiConfig;
 import org.chromium.chrome.browser.widget.displaystyle.UiConfig.DisplayStyle;
 import org.chromium.chrome.browser.widget.selection.SelectionDelegate.SelectionObserver;
 import org.chromium.ui.base.DeviceFormFactor;
 
 import java.util.List;
 
 import javax.annotation.Nullable;
 
 /**
  * Contains UI elements common to selectable list views: a loading view, empty view, selection
  * toolbar, shadow, and RecyclerView.
  *
  * After the SelectableListLayout is inflated, it should be initialized through calls to
  * #initializeRecyclerView(), #initializeToolbar(), and #initializeEmptyView().
  *
  * @param <E> The type of the selectable items this layout holds.
  */
 public class SelectableListLayout<E>
-        extends RelativeLayout implements DisplayStyleObserver, SelectionObserver<E> {
+        extends FrameLayout implements DisplayStyleObserver, SelectionObserver<E> {
     /**
      * @param res Resources used to retrieve drawables and dimensions.
      * @return The default list item lateral margin size in pixels. This value should be used in
      *         {@link HorizontalDisplayStyle#REGULAR} to hide the lateral shadow and rounded edges
      *         on items that use the list_item* 9-patches as a background.
      */
     public static int getDefaultListItemLateralMarginPx(Resources res) {
         if (sDefaultListItemLateralMarginPx == -1) {
             Rect listItemShadow = new Rect();
             ApiCompatibilityUtils.getDrawable(res, R.drawable.card_middle)
@@ skipping 242 matching lines @@
         setToolbarShadowVisibility();
     }
 
     /**
      * Removes the toolbar view from this view and returns it so that it may be re-attached
      * elsewhere.
      * @return The toolbar view.
      */
     public Toolbar detachToolbarView() {
         removeView(mToolbar);
+
+        // The top margin for the content and shadow needs to be removed now that the toolbar
+        // has been removed.
+        View content = findViewById(R.id.list_content);
+        ((MarginLayoutParams) content.getLayoutParams()).topMargin = 0;
+        ((MarginLayoutParams) mToolbarShadow.getLayoutParams()).topMargin = 0;
+
         return mToolbar;
     }
 
     /**
      * Called when a search is starting.
      */
     public void onStartSearch() {
         mRecyclerView.setItemAnimator(null);
         mToolbarShadow.setVisibility(View.VISIBLE);
         mEmptyView.setText(mSearchEmptyStringResId);
@@ skipping 21 matching lines @@
             padding = (int) (((screenWidthDp - UiConfig.WIDE_DISPLAY_STYLE_MIN_WIDTH_DP) / 2.f)
                     * dpToPx);
             padding = (int) Math.max(WIDE_DISPLAY_MIN_PADDING_DP * dpToPx, padding);
         }
         return padding;
     }
 
     private void setToolbarShadowVisibility() {
         if (mToolbarPermanentlyHidden || mToolbar == null || mRecyclerView == null) return;
 
-        boolean showShadow = mRecyclerView.computeVerticalScrollOffset() != 0
-                || mToolbar.isSearching() || mToolbar.getSelectionDelegate().isSelectionEnabled();
+        boolean showShadow = mRecyclerView.canScrollVertically(-1) || mToolbar.isSearching()
+                || mToolbar.getSelectionDelegate().isSelectionEnabled();
         mToolbarShadow.setVisibility(showShadow ? View.VISIBLE : View.GONE);
     }
 
     /**
      * Unlike ListView or GridView, RecyclerView does not provide default empty
      * view implementation. We need to check it ourselves.
      */
     private void updateEmptyViewVisibility() {
         mEmptyView.setVisibility(mAdapter.getItemCount() == 0 ? View.VISIBLE : View.GONE);
     }
 
     @VisibleForTesting
     public View getToolbarShadowForTests() {
         return mToolbarShadow;
     }
 
     private void setEmptyOrLoadingViewStyle(View view) {
         if (!FeatureUtilities.isChromeHomeEnabled()) return;
 
         ((FrameLayout.LayoutParams) view.getLayoutParams()).gravity = Gravity.CENTER_HORIZONTAL;
         ApiCompatibilityUtils.setPaddingRelative(view, ApiCompatibilityUtils.getPaddingStart(view),
                 view.getPaddingTop() + mChromeHomeEmptyAndLoadingViewTopPadding,
                 ApiCompatibilityUtils.getPaddingEnd(view), view.getPaddingBottom());
     }
 }