chrome/android/java/res/layout/custom_tabs_control_container.xml - Issue 2410603002: Inflate toolbar layouts in ControlContainer

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2410603002: Inflate toolbar layouts in ControlContainer (Closed)

Patch Set: fix ID Created 4 years, 2 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:

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

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

index 87b45c70d06ede37cc83c44e96ea0d5f8d49f13c..1b2662db53d888dea101a611ffb0cd115dcfd1dc 100644

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

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

@@ -12,11 +12,10 @@

android:id="@+id/toolbar_container"

android:layout_width="match_parent"

android:layout_height="wrap_content">

- <include

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

+ <ViewStub

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

android:layout_width="match_parent"

- android:layout_height="@dimen/custom_tabs_control_container_height"

- layout="@layout/custom_tabs_toolbar" />

+ android:layout_height="@dimen/custom_tabs_control_container_height" />

<ImageView

android:id="@+id/toolbar_shadow"

android:src="@drawable/toolbar_shadow"