🏠 Add pull-handle to bottom toolbar

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarControlContainer.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.content.Context;
 import android.graphics.Canvas;
 import android.graphics.PorterDuff;
 import android.graphics.Rect;
@@ skipping 145 matching lines @@
         protected boolean isReadyForCapture() {
             return mReadyForBitmapCapture;
         }
     }
 
     private static class ToolbarViewResourceAdapter extends ViewResourceAdapter {
         private final int[] mTempPosition = new int[2];
         private final View mToolbarContainer;
 
         private Toolbar mToolbar;
-        private int mToolbarActualHeightPx;
         private int mTabStripHeightPx;
 
         /** Builds the resource adapter for the toolbar. */
         public ToolbarViewResourceAdapter(View toolbarContainer) {
             super(toolbarContainer);
             mToolbarContainer = toolbarContainer;
         }
 
         /**
          * Set the toolbar after it has been dynamically inflated.
          * @param toolbar The browser's toolbar.
          */
         public void setToolbar(Toolbar toolbar) {
             mToolbar = toolbar;
-            int containerHeightResId = R.dimen.control_container_height;
-            if (mToolbar instanceof CustomTabToolbar) {
-                containerHeightResId = R.dimen.custom_tabs_control_container_height;
-            }
-            mToolbarActualHeightPx = mToolbarContainer.getResources().getDimensionPixelSize(
-                    containerHeightResId);
             mTabStripHeightPx = mToolbarContainer.getResources().getDimensionPixelSize(
                     R.dimen.tab_strip_height);
         }
 
         /**
          * Force this resource to be recaptured in full, ignoring the checks
          * {@link #invalidate(Rect)} does.
          */
         public void forceInvalidate() {
             super.invalidate(null);
@@ skipping 24 matching lines @@
         @Override
         protected void onCaptureEnd() {
             mToolbar.setTextureCaptureMode(false);
             // Forcing a texture capture should only be done for one draw. Turn off forced
             // texture capture.
             mToolbar.setForceTextureCapture(false);
         }
 
         @Override
         protected void computeContentPadding(Rect outContentPadding) {
-            outContentPadding.set(0, mTabStripHeightPx, mToolbarContainer.getWidth(),
-                    mToolbarActualHeightPx);
+            outContentPadding.set(
+                    0, mTabStripHeightPx, mToolbarContainer.getWidth(), mToolbar.getHeight());
         }
 
         @Override
         protected void computeContentAperture(Rect outContentAperture) {
             mToolbar.getLocationBarContentRect(outContentAperture);
             mToolbar.getPositionRelativeToContainer(mToolbarContainer, mTempPosition);
             outContentAperture.offset(mTempPosition[0], mTempPosition[1]);
         }
     }
 
@@ skipping 32 matching lines @@
 
         @Override
         public boolean shouldRecognizeSwipe(MotionEvent e1, MotionEvent e2) {
             if (isOnTabStrip(e1)) return false;
             if (mToolbar.shouldIgnoreSwipeGesture()) return false;
             if (UiUtils.isKeyboardShowing(getContext(), ToolbarControlContainer.this)) return false;
             return true;
         }
     }
 }