Index: chrome/android/java/res/layout/bottom_control_container.xml |
diff --git a/chrome/android/java/res/layout/bottom_control_container.xml b/chrome/android/java/res/layout/bottom_control_container.xml |
index e83d9dcbb4aed86b78f5a7ea32006e1ab1a0b848..1153e0af1c9f78b16aaaf1210445bef0d0bcb24b 100644 |
--- a/chrome/android/java/res/layout/bottom_control_container.xml |
+++ b/chrome/android/java/res/layout/bottom_control_container.xml |
@@ -2,37 +2,51 @@ |
<!-- 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. --> |
-<org.chromium.chrome.browser.toolbar.ToolbarControlContainer xmlns:android="http://schemas.android.com/apk/res/android" |
- android:id="@+id/control_container" |
+ |
+<org.chromium.chrome.browser.widget.BottomSheet |
+ xmlns:android="http://schemas.android.com/apk/res/android" |
+ android:id="@+id/bottom_sheet" |
android:layout_width="match_parent" |
- android:layout_height="wrap_content" |
- android:layout_gravity="bottom" |
- android:minHeight="@dimen/control_container_height" > |
- <view |
- class="org.chromium.chrome.browser.toolbar.ToolbarControlContainer$ToolbarViewResourceFrameLayout" |
- android:id="@+id/toolbar_container" |
+ android:layout_height="wrap_content" > |
+ |
+ <org.chromium.chrome.browser.toolbar.ToolbarControlContainer |
+ android:id="@+id/control_container" |
android:layout_width="match_parent" |
- android:layout_height="wrap_content"> |
- <ImageView |
- android:id="@+id/toolbar_shadow" |
+ android:layout_height="wrap_content" |
+ android:minHeight="@dimen/control_container_height" > |
+ <view |
+ class="org.chromium.chrome.browser.toolbar.ToolbarControlContainer$ToolbarViewResourceFrameLayout" |
+ android:id="@+id/toolbar_container" |
android:layout_width="match_parent" |
- android:layout_height="@dimen/toolbar_shadow_height" |
- android:src="@drawable/toolbar_shadow" |
- android:scaleType="fitXY" |
- android:scaleY="-1" |
- android:contentDescription="@null" /> |
- <ViewStub |
- android:id="@+id/toolbar_stub" |
- android:layout_width="match_parent" |
- android:layout_height="@dimen/toolbar_height_no_shadow" |
- android:layout_marginTop="@dimen/toolbar_shadow_height" /> |
- <ViewStub |
- android:id="@+id/find_toolbar_stub" |
- android:inflatedId="@+id/find_toolbar" |
- android:layout_marginTop="@dimen/toolbar_shadow_height" |
- android:layout_width="match_parent" |
- android:layout_height="@dimen/toolbar_height_no_shadow" |
- android:layout="@layout/find_toolbar" |
- android:visibility="gone" /> |
- </view> |
-</org.chromium.chrome.browser.toolbar.ToolbarControlContainer> |
+ android:layout_height="wrap_content"> |
+ <ImageView |
+ android:id="@+id/toolbar_shadow" |
+ android:layout_width="match_parent" |
+ android:layout_height="@dimen/toolbar_shadow_height" |
+ android:src="@drawable/toolbar_shadow" |
+ android:scaleType="fitXY" |
+ android:scaleY="-1" |
+ android:contentDescription="@null" /> |
+ <ViewStub |
+ android:id="@+id/toolbar_stub" |
+ android:layout_width="match_parent" |
+ android:layout_height="@dimen/toolbar_height_no_shadow" |
+ android:layout_marginTop="@dimen/toolbar_shadow_height" /> |
+ <ViewStub |
+ android:id="@+id/find_toolbar_stub" |
+ android:inflatedId="@+id/find_toolbar" |
+ android:layout_marginTop="@dimen/toolbar_shadow_height" |
+ android:layout_width="match_parent" |
+ android:layout_height="@dimen/toolbar_height_no_shadow" |
+ android:layout="@layout/find_toolbar" |
+ android:visibility="gone" /> |
+ </view> |
+ </org.chromium.chrome.browser.toolbar.ToolbarControlContainer> |
+ |
+ <View |
+ android:id="@+id/bottom_sheet_content" |
+ android:layout_width="match_parent" |
+ android:layout_height="match_parent" |
+ android:background="@android:color/white" /> |
+ |
+</org.chromium.chrome.browser.widget.BottomSheet> |