🏠 Add pull-handle to bottom toolbar

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.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.toolbar;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.annotation.SuppressLint;
@@ skipping 59 matching lines @@
     private ToolbarDataProvider mToolbarDataProvider;
     private ToolbarTabController mToolbarTabController;
     @Nullable
     protected ToolbarProgressBar mProgressBar;
 
     private boolean mNativeLibraryReady;
     private boolean mUrlHasFocus;
 
     private long mFirstDrawTimeMs;
 
-    protected final int mToolbarHeightWithoutShadow;
-
     private boolean mFindInPageToolbarShowing;
 
     protected boolean mShowMenuBadge;
     private AnimatorSet mMenuBadgeAnimatorSet;
     private boolean mIsMenuBadgeAnimationRunning;
 
     /**
      * Basic constructor for {@link ToolbarLayout}.
      */
     public ToolbarLayout(Context context, AttributeSet attrs) {
         super(context, attrs);
-        mToolbarHeightWithoutShadow = getResources().getDimensionPixelOffset(
-                getToolbarHeightWithoutShadowResId());
         mDarkModeTint =
                 ApiCompatibilityUtils.getColorStateList(getResources(), R.color.dark_mode_tint);
         mLightModeTint =
                 ApiCompatibilityUtils.getColorStateList(getResources(), R.color.light_mode_tint);
     }
 
     /**
      * Get the top margin of the progress bar relative to the toolbar layout. This is used to set
      * the position of the progress bar (either top or bottom of the toolbar).
      * @return The top margin of the progress bar.
      */
     protected int getProgressBarTopMargin() {
-        return mToolbarHeightWithoutShadow
+        return getHeight()
                 - getResources().getDimensionPixelSize(R.dimen.toolbar_progress_bar_height);
     }
 
     @Override
+    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+        super.onLayout(changed, left, top, right, bottom);
+
+        if (mProgressBar == null) {

[gone, 2017/03/14 22:38:40]

Does this really have to be here?  onLayout seems like an odd place to add a new
View to the hierarchy.

[mdjones, 2017/03/15 17:26:12]

This is the result of a bad rebase. The latest patch set excludes all these
changes.

+            mProgressBar = new ToolbarProgressBar(getContext(), getProgressBarTopMargin());
+            if (isNativeLibraryReady()) mProgressBar.initializeAnimation();
+            addProgressBarToHierarchy();
+        }
+    }
+
+    @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
 
-        mProgressBar = new ToolbarProgressBar(getContext(), getProgressBarTopMargin());
-
-        if (isNativeLibraryReady()) mProgressBar.initializeAnimation();
-
         mMenuButton = (TintedImageButton) findViewById(R.id.menu_button);
         mMenuBadge = (ImageView) findViewById(R.id.menu_badge);
         mMenuButtonWrapper = findViewById(R.id.menu_button_wrapper);
 
         // Initialize the provider to an empty version to avoid null checking everywhere.
         mToolbarDataProvider = new ToolbarDataProvider() {
             @Override
             public boolean isIncognito() {
                 return false;
             }
@@ skipping 33 matching lines @@
     /**
      * Quick getter for LayoutParams for a View inside a FrameLayout.
      * @param view {@link View} to fetch the layout params for.
      * @return {@link LayoutParams} the given {@link View} is currently using.
      */
     protected FrameLayout.LayoutParams getFrameLayoutParams(View view) {
         return ((FrameLayout.LayoutParams) view.getLayoutParams());
     }
 
     /**
-     * @return The resource id to be used while getting the toolbar height with no shadow.
-     */
-    protected int getToolbarHeightWithoutShadowResId() {
-        return R.dimen.toolbar_height_no_shadow;
-    }
-
-    /**
      * Initialize the external dependencies required for view interaction.
      * @param toolbarDataProvider The provider for toolbar data.
      * @param tabController       The controller that handles interactions with the tab.
      * @param appMenuButtonHelper The helper for managing menu button interactions.
      */
     public void initialize(ToolbarDataProvider toolbarDataProvider,
             ToolbarTabController tabController, AppMenuButtonHelper appMenuButtonHelper) {
         mToolbarDataProvider = toolbarDataProvider;
         mToolbarTabController = tabController;
 
@@ skipping 67 matching lines @@
         if (mProgressBar == null) return;
 
         ViewGroup controlContainer =
                 (ViewGroup) getRootView().findViewById(R.id.control_container);
         int progressBarPosition = UiUtils.insertAfter(
                 controlContainer, mProgressBar, (View) getParent());
         assert progressBarPosition >= 0;
         mProgressBar.setProgressBarContainer(controlContainer);
     }
 
-    @Override
-    protected void onAttachedToWindow() {
-        super.onAttachedToWindow();
-        addProgressBarToHierarchy();
-    }
-
     /**
      * Shows the content description toast for items on the toolbar.
      * @param view The view to anchor the toast.
      * @param description The string shown in the toast.
      * @return Whether a toast has been shown successfully.
      */
     protected boolean showAccessibilityToast(View view, CharSequence description) {
         if (description == null) return false;
 
         final int screenWidth = getResources().getDisplayMetrics().widthPixels;
@@ skipping 521 matching lines @@
                     R.string.accessibility_toolbar_btn_menu_update));
         } else {
             mMenuButton.setContentDescription(getResources().getString(
                     R.string.accessibility_toolbar_btn_menu));
         }
     }
 
     @Override
     public void setBottomSheet(BottomSheet sheet) {}
 }