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

Side by Side Diff: chrome/android/java/res/layout/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

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/control_container_height" >	9 android:minHeight="@dimen/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_marginTop="@dimen/tab_strip_height"

15 <include	14 android:layout_height="@dimen/toolbar_height_no_shadow"

16 android:id="@+id/toolbar"	15 layout="@layout/toolbar" />

17 android:layout_width="match_parent"	16 <ImageView

18 android:layout_marginTop="@dimen/tab_strip_height"	17 android:id="@+id/toolbar_shadow"

19 android:layout_height="@dimen/toolbar_height_no_shadow"	18 android:src="@drawable/toolbar_shadow"

20 layout="@layout/toolbar" />	19 android:layout_width="match_parent"

21 <ImageView	20 android:layout_height="wrap_content"

22 android:id="@+id/toolbar_shadow"	21 android:layout_marginTop="@dimen/tab_strip_and_toolbar_height"

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

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

25 android:layout_height="wrap_content"	24 <ViewStub

26 android:layout_marginTop="@dimen/tab_strip_and_toolbar_height"	25 android:id="@+id/find_toolbar_stub"

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

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

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

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

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

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

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

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

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

36 android:layout="@layout/find_toolbar" />	35 android:layout_width="@dimen/find_in_page_popup_width"

37 <ViewStub	36 android:layout_height="@dimen/find_in_page_popup_height"

38 android:id="@+id/find_toolbar_tablet_stub"	37 android:layout_marginEnd="@dimen/find_in_page_popup_margin_end"

39 android:inflatedId="@+id/find_toolbar"	38 android:layout_gravity="end\|top"

40 android:layout_width="@dimen/find_in_page_popup_width"	39 android:layout="@layout/find_toolbar" />

41 android:layout_height="@dimen/find_in_page_popup_height"

42 android:layout_marginEnd="@dimen/find_in_page_popup_margin_end"

43 android:layout_gravity="end\|top"

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

45 </view>

46 </org.chromium.chrome.browser.toolbar.ToolbarControlContainer>	40 </org.chromium.chrome.browser.toolbar.ToolbarControlContainer>

OLD	NEW

« no previous file with comments | « no previous file | chrome/android/java/res/layout/custom_tabs_control_container.xml » ('j') | no next file with comments »