chrome/android/java/res/layout/custom_tabs_control_container.xml - Issue 1221333007: Get rid of ToolbarViewResourceFrameLayout

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

Issue 1221333007: Get rid of ToolbarViewResourceFrameLayout (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Start sending ToolbarLayout itself as container Created 5 years, 5 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 unified diff | Download patch

« no previous file with comments | « chrome/android/java/res/layout/control_container.xml ('k') | chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarControlContainer.java » ('j') | no next file with comments »
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 2015 The Chromium Authors. All rights reserved.	2 <!-- Copyright 2015 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 <org.chromium.chrome.browser.toolbar.ToolbarControlContainer xmlns:android="http ://schemas.android.com/apk/res/android"

6 android:id="@+id/control_container"	6 android:id="@+id/control_container"

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

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

9 android:minHeight="@dimen/custom_tabs_control_container_height" >	9 android:minHeight="@dimen/custom_tabs_control_container_height" >

10 <view	10 <include

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

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

13 android:layout_width="match_parent"	12 android:layout_width="match_parent"

14 android:layout_height="wrap_content">	13 android:layout_height="@dimen/custom_tabs_control_container_height"

15 <include	14 layout="@layout/custom_tabs_toolbar" />

16 android:id="@+id/toolbar"	15 <ImageView

17 android:layout_width="match_parent"	16 android:id="@+id/toolbar_shadow"

18 android:layout_height="@dimen/custom_tabs_control_container_height"	17 android:src="@drawable/toolbar_shadow"

19 layout="@layout/custom_tabs_toolbar" />	18 android:layout_width="match_parent"

20 <ImageView	19 android:layout_height="wrap_content"

21 android:id="@+id/toolbar_shadow"	20 android:layout_marginTop="@dimen/custom_tabs_control_container_height"

22 android:src="@drawable/toolbar_shadow"	21 android:scaleType="fitXY"

23 android:layout_width="match_parent"	22 android:contentDescription="@null" />

24 android:layout_height="wrap_content"	23 <ViewStub

25 android:layout_marginTop="@dimen/custom_tabs_control_container_heigh t"	24 android:id="@+id/find_toolbar_stub"

26 android:scaleType="fitXY"	25 android:inflatedId="@+id/find_toolbar"

27 android:contentDescription="@null" />	26 android:visibility="gone"

28 <ViewStub	27 android:layout_marginTop="@dimen/tab_strip_height"

29 android:id="@+id/find_toolbar_stub"	28 android:layout_width="match_parent"

30 android:inflatedId="@+id/find_toolbar"	29 android:layout_height="@dimen/custom_tabs_control_container_height"

31 android:visibility="gone"	30 android:layout="@layout/find_toolbar" />

32 android:layout_marginTop="@dimen/tab_strip_height"	31 <ViewStub

33 android:layout_width="match_parent"	32 android:id="@+id/find_toolbar_tablet_stub"

34 android:layout_height="@dimen/custom_tabs_control_container_height"	33 android:inflatedId="@+id/find_toolbar"

	34 android:layout_width="@dimen/find_in_page_popup_width"

	35 android:layout_height="@dimen/find_in_page_popup_height"

	36 android:layout_marginEnd="@dimen/find_in_page_popup_margin_end"

	37 android:layout_gravity="end\|top"

35 android:layout="@layout/find_toolbar" />	38 android:layout="@layout/find_toolbar" />

36 <ViewStub

37 android:id="@+id/find_toolbar_tablet_stub"

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

39 android:layout_width="@dimen/find_in_page_popup_width"

40 android:layout_height="@dimen/find_in_page_popup_height"

41 android:layout_marginEnd="@dimen/find_in_page_popup_margin_end"

42 android:layout_gravity="end\|top"

43 android:layout="@layout/find_toolbar" />

44 </view>

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

OLD	NEW