chrome/android/java/res/layout/bottom_control_container.xml - Issue 2625923002: Introduce the bottom sheet class for Chrome Home

Side by Side Diff: chrome/android/java/res/layout/bottom_control_container.xml

Issue 2625923002: Introduce the bottom sheet class for Chrome Home (Closed)

Patch Set: rebase 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:

« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java » ('j') | chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <?xml version="1.0" encoding="utf-8"?>	1 <?xml version="1.0" encoding="utf-8"?>

2 <!-- Copyright 2016 The Chromium Authors. All rights reserved.	2 <!-- Copyright 2016 The Chromium Authors. All rights reserved.

3 Use of this source code is governed by a BSD-style license that can be	3 Use of this source code is governed by a BSD-style license that can be

4 found in the LICENSE file. -->	4 found in the LICENSE file. -->

5 <org.chromium.chrome.browser.toolbar.ToolbarControlContainer xmlns:android="http ://schemas.android.com/apk/res/android"	5

6 android:id="@+id/control_container"	6 <org.chromium.chrome.browser.widget.BottomSheet

	7 xmlns:android="http://schemas.android.com/apk/res/android"

	8 android:id="@+id/bottom_sheet"

7 android:layout_width="match_parent"	9 android:layout_width="match_parent"

8 android:layout_height="wrap_content"	10 android:layout_height="wrap_content"

9 android:layout_gravity="bottom"	11 android:orientation="vertical" >
	gone 2017/01/19 18:00:41 Given that BottomSheet is your own thing and every Given that BottomSheet is your own thing and everything is forced to be vertical, this should be put in the class' constructor so that no one can use it incorrectly in the future. mdjones 2017/01/19 21:49:08 Done. Show quoted text On 2017/01/19 18:00:41, dfalcantara (load balance plz) wrote: > Given that BottomSheet is your own thing and everything is forced to be > vertical, this should be put in the class' constructor so that no one can use it > incorrectly in the future. Done.
10 android:minHeight="@dimen/control_container_height" >	12

11 <view	13 <org.chromium.chrome.browser.toolbar.ToolbarControlContainer

12 class="org.chromium.chrome.browser.toolbar.ToolbarControlContainer$Toolb arViewResourceFrameLayout"	14 android:id="@+id/control_container"

13 android:id="@+id/toolbar_container"

14 android:layout_width="match_parent"	15 android:layout_width="match_parent"

15 android:layout_height="wrap_content">	16 android:layout_height="wrap_content"

16 <ImageView	17 android:minHeight="@dimen/control_container_height" >

17 android:id="@+id/toolbar_shadow"	18 <view

	19 class="org.chromium.chrome.browser.toolbar.ToolbarControlContainer$T oolbarViewResourceFrameLayout"

	20 android:id="@+id/toolbar_container"

18 android:layout_width="match_parent"	21 android:layout_width="match_parent"

19 android:layout_height="@dimen/toolbar_shadow_height"	22 android:layout_height="wrap_content">

20 android:src="@drawable/toolbar_shadow"	23 <ImageView

21 android:scaleType="fitXY"	24 android:id="@+id/toolbar_shadow"

22 android:scaleY="-1"	25 android:layout_width="match_parent"

23 android:contentDescription="@null" />	26 android:layout_height="@dimen/toolbar_shadow_height"

24 <ViewStub	27 android:src="@drawable/toolbar_shadow"

25 android:id="@+id/toolbar_stub"	28 android:scaleType="fitXY"

26 android:layout_width="match_parent"	29 android:scaleY="-1"

27 android:layout_height="@dimen/toolbar_height_no_shadow"	30 android:contentDescription="@null" />

28 android:layout_marginTop="@dimen/toolbar_shadow_height" />	31 <ViewStub

29 <ViewStub	32 android:id="@+id/toolbar_stub"

30 android:id="@+id/find_toolbar_stub"	33 android:layout_width="match_parent"

31 android:inflatedId="@+id/find_toolbar"	34 android:layout_height="@dimen/toolbar_height_no_shadow"

32 android:layout_marginTop="@dimen/toolbar_shadow_height"	35 android:layout_marginTop="@dimen/toolbar_shadow_height" />

33 android:layout_width="match_parent"	36 <ViewStub

34 android:layout_height="@dimen/toolbar_height_no_shadow"	37 android:id="@+id/find_toolbar_stub"

35 android:layout="@layout/find_toolbar"	38 android:inflatedId="@+id/find_toolbar"

36 android:visibility="gone" />	39 android:layout_marginTop="@dimen/toolbar_shadow_height"

37 </view>	40 android:layout_width="match_parent"

38 </org.chromium.chrome.browser.toolbar.ToolbarControlContainer>	41 android:layout_height="@dimen/toolbar_height_no_shadow"

	42 android:layout="@layout/find_toolbar"

	43 android:visibility="gone" />

	44 </view>

	45 </org.chromium.chrome.browser.toolbar.ToolbarControlContainer>

	46

	47 <View

	48 android:id="@+id/bottom_sheet_content"

	49 android:layout_width="match_parent"

	50 android:layout_height="match_parent"

	51 android:background="@android:color/white" />

	52

	53 </org.chromium.chrome.browser.widget.BottomSheet>

OLD	NEW