Omnibox results show correctly for Chrome Home

chrome/android/java/src/org/chromium/chrome/browser/widget/BottomSheet.java

 // Copyright 2017 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;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
 import android.content.Context;
 import android.graphics.Region;
 import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
 import android.support.v4.view.ScrollingView;
 import android.util.AttributeSet;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.VelocityTracker;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.DecelerateInterpolator;
 import android.view.animation.Interpolator;
 import android.widget.FrameLayout;
-import android.widget.LinearLayout;
 
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.NativePage;
 import org.chromium.chrome.browser.ntp.NewTabPage;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.util.MathUtils;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
 /**
  * This class defines the bottom sheet that has multiple states and a persistently showing toolbar.
  * Namely, the states are:
  * - PEEK: Only the toolbar is visible at the bottom of the screen.
  * - HALF: The sheet is expanded to consume around half of the screen.
  * - FULL: The sheet is expanded to its full height.
  *
  * All the computation in this file is based off of the bottom of the screen instead of the top
  * for simplicity. This means that the bottom of the screen is 0 on the Y axis.
  */
-public class BottomSheet extends LinearLayout {
+public class BottomSheet extends FrameLayout {
     /** The different states that the bottom sheet can have. */
     @IntDef({SHEET_STATE_PEEK, SHEET_STATE_HALF, SHEET_STATE_FULL})
     @Retention(RetentionPolicy.SOURCE)
     public @interface SheetState {}
     public static final int SHEET_STATE_PEEK = 0;
     public static final int SHEET_STATE_HALF = 1;
     public static final int SHEET_STATE_FULL = 2;
 
     /**
      * The base duration of the settling animation of the sheet. 218 ms is a spec for material
@@ skipping 148 matching lines @@
     }
 
     /**
      * Constructor for inflation from XML.
      * @param context An Android context.
      * @param atts The XML attributes.
      */
     public BottomSheet(Context context, AttributeSet atts) {
         super(context, atts);
 
-        setOrientation(LinearLayout.VERTICAL);
         mVelocityTracker = VelocityTracker.obtain();
 
         mGestureDetector = new GestureDetector(context, new BottomSheetSwipeDetector());
         mGestureDetector.setIsLongpressEnabled(false);
     }
 
     @Override
     public boolean onInterceptTouchEvent(MotionEvent e) {
         // The incoming motion event may have been adjusted by the view sending it down. Create a
         // motion event with the raw (x, y) coordinates of the original so the gesture detector
@@ skipping 153 matching lines @@
         if (mContainerHeight <= 0) return;
 
         // Though mStateRatios is a static constant, the peeking ratio is computed here because
         // the correct toolbar height and container height are not know until those views are
         // inflated.
         mStateRatios[0] = mToolbarHeight / mContainerHeight;
 
         // Compute the height that the content section of the bottom sheet.
         float contentHeight =
                 (mContainerHeight * mStateRatios[mStateRatios.length - 1]) - mToolbarHeight;
-        mBottomSheetContent.setLayoutParams(
-                new LinearLayout.LayoutParams((int) mContainerWidth, (int) contentHeight));
+
+        MarginLayoutParams sheetContentParams =
+                (MarginLayoutParams) mBottomSheetContent.getLayoutParams();
+        sheetContentParams.width = (int) mContainerWidth;
+        sheetContentParams.height = (int) contentHeight;
+        sheetContentParams.topMargin = (int) mToolbarHeight;
+
+        MarginLayoutParams toolbarShadowParams =
+                (MarginLayoutParams) findViewById(R.id.toolbar_shadow).getLayoutParams();
+        toolbarShadowParams.topMargin = (int) mToolbarHeight;
     }
 
     /**
      * Find the first ScrollingView in a view hierarchy.
      * TODO(mdjones): The root of native pages should be a ScrollingView so this logic is not
      * necessary.
      * @param view The root of the tree or subtree.
      * @return The first scrolling view or null.
      */
     private ScrollingView findScrollingChild(@Nullable View view) {
@@ skipping 161 matching lines @@
 
         float inverseThreshold = 1.0f - THRESHOLD_TO_NEXT_STATE;
         float thresholdToNextState = yVelocity < 0.0f ? THRESHOLD_TO_NEXT_STATE : inverseThreshold;
 
         if ((sheetHeight - lowerBound) / distance > thresholdToNextState) {
             return nextState;
         }
         return prevState;
     }
 }