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

Unified 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 side-by-side diff with in-line comments

Download patch

Index: chrome/android/java/res/layout/control_container.xml

diff --git a/chrome/android/java/res/layout/control_container.xml b/chrome/android/java/res/layout/control_container.xml

index a771affb59b5d91290c0641e489d25cce7130887..ffbae3125151fda4dfe07053d746c00b0e180c8e 100644

--- a/chrome/android/java/res/layout/control_container.xml

+++ b/chrome/android/java/res/layout/control_container.xml

@@ -7,40 +7,34 @@

android:layout_width="match_parent"

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"

+ <include

+ android:id="@+id/toolbar"

android:layout_width="match_parent"

- android:layout_height="wrap_content">

- <include

- android:id="@+id/toolbar"

- android:layout_width="match_parent"

- android:layout_marginTop="@dimen/tab_strip_height"

- android:layout_height="@dimen/toolbar_height_no_shadow"

- layout="@layout/toolbar" />

- <ImageView

- android:id="@+id/toolbar_shadow"

- android:src="@drawable/toolbar_shadow"

- android:layout_width="match_parent"

- android:layout_height="wrap_content"

- android:layout_marginTop="@dimen/tab_strip_and_toolbar_height"

- android:scaleType="fitXY"

- android:contentDescription="@null" />

- <ViewStub

- android:id="@+id/find_toolbar_stub"

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

- android:visibility="gone"

- android:layout_marginTop="@dimen/tab_strip_height"

- android:layout_width="match_parent"

- android:layout_height="@dimen/toolbar_height_no_shadow"

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

- <ViewStub

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

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

- android:layout_width="@dimen/find_in_page_popup_width"

- android:layout_height="@dimen/find_in_page_popup_height"

- android:layout_marginEnd="@dimen/find_in_page_popup_margin_end"

- android:layout_gravity="end|top"

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

- </view>

+ android:layout_marginTop="@dimen/tab_strip_height"

+ android:layout_height="@dimen/toolbar_height_no_shadow"

+ layout="@layout/toolbar" />

+ <ImageView

+ android:id="@+id/toolbar_shadow"

+ android:src="@drawable/toolbar_shadow"

+ android:layout_width="match_parent"

+ android:layout_height="wrap_content"

+ android:layout_marginTop="@dimen/tab_strip_and_toolbar_height"

+ android:scaleType="fitXY"

+ android:contentDescription="@null" />

+ <ViewStub

+ android:id="@+id/find_toolbar_stub"

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

+ android:visibility="gone"

+ android:layout_marginTop="@dimen/tab_strip_height"

+ android:layout_width="match_parent"

+ android:layout_height="@dimen/toolbar_height_no_shadow"

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

+ <ViewStub

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

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

+ android:layout_width="@dimen/find_in_page_popup_width"

+ android:layout_height="@dimen/find_in_page_popup_height"

+ android:layout_marginEnd="@dimen/find_in_page_popup_margin_end"

+ android:layout_gravity="end|top"

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

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

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