| Index: chrome/android/java/src/org/chromium/chrome/browser/toolbar/BottomToolbarPhone.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/BottomToolbarPhone.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/BottomToolbarPhone.java
|
| index 314eebe2bd766bfa110b50a5931c18c92c441b49..22ec494c32250e42a49e3a3ed89fdb66840b6a51 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/BottomToolbarPhone.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/BottomToolbarPhone.java
|
| @@ -117,6 +117,8 @@ public class BottomToolbarPhone extends ToolbarPhone {
|
| context.getResources(), R.drawable.toolbar_handle_dark);
|
| mHandleLight = ApiCompatibilityUtils.getDrawable(
|
| context.getResources(), R.drawable.toolbar_handle_light);
|
| + mLocationBarVerticalMargin =
|
| + getResources().getDimensionPixelOffset(R.dimen.bottom_location_bar_vertical_margin);
|
| }
|
|
|
| @Override
|
| @@ -193,6 +195,11 @@ public class BottomToolbarPhone extends ToolbarPhone {
|
| public void onFinishInflate() {
|
| super.onFinishInflate();
|
|
|
| + // Add extra top margin to the URL bar to compensate for the change to location bar's
|
| + // vertical margin in the constructor.
|
| + ((MarginLayoutParams) mLocationBar.findViewById(R.id.url_bar).getLayoutParams()).topMargin =
|
| + getResources().getDimensionPixelSize(R.dimen.bottom_toolbar_url_bar_top_margin);
|
| +
|
| // Exclude the location bar from the list of browsing mode views. This prevents its
|
| // visibility from changing during transitions.
|
| mBrowsingModeViews.remove(mLocationBar);
|
|
|