Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(22)

Unified Diff: chrome/android/java/res/layout/bottom_control_container.xml

Issue 2625923002: Introduce the bottom sheet class for Chrome Home (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 998fe8dc0dee5c4f827b93bc949ecc3118fcc259..44e0ef5880c6fd0275646c6ab23aa4efe1130c97 100644
--- a/chrome/android/java/res/layout/bottom_control_container.xml
+++ b/chrome/android/java/res/layout/bottom_control_container.xml
@@ -2,37 +2,58 @@
<!-- 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" >
+
+ <LinearLayout
+ android:id="@+id/bottom_sheet_content_wrapper"
Ian Wen 2017/01/11 19:46:53 This linear layout might not be necessary. You can
mdjones 2017/01/12 21:26:57 Removed.
android:layout_width="match_parent"
- android:layout_height="wrap_content">
- <ImageView
- android:id="@+id/toolbar_shadow"
+ android:layout_height="wrap_content"
+ android:orientation="vertical" >
+
+ <org.chromium.chrome.browser.toolbar.ToolbarControlContainer
+ android:id="@+id/control_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_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="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:visibility="gone"
+ 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" />
+ </view>
+ </org.chromium.chrome.browser.toolbar.ToolbarControlContainer>
+
+ <View
+ android:id="@+id/bottom_sheet_content"
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:visibility="gone"
- 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" />
- </view>
-</org.chromium.chrome.browser.toolbar.ToolbarControlContainer>
+ android:layout_height="match_parent"
+ android:background="@android:color/white" />
+
+ </LinearLayout>
+</org.chromium.chrome.browser.widget.BottomSheet>

Powered by Google App Engine
This is Rietveld 408576698