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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

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

View unified diff | Download patch

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

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	5

6 <!-- The toolbar containing the URL bar, back button, and NTP button.	6 <!-- The toolbar containing the URL bar, back button, and NTP button.

7 -->	7 -->

8 <merge xmlns:android="http://schemas.android.com/apk/res/android"	8 <merge xmlns:android="http://schemas.android.com/apk/res/android"

9 xmlns:chrome="http://schemas.android.com/apk/res-auto">	9 xmlns:chrome="http://schemas.android.com/apk/res-auto">

10	10

(...skipping 58 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
69 </LinearLayout>	69 </LinearLayout>

70	70

71 <org.chromium.chrome.browser.widget.ToolbarProgressBar	71 <org.chromium.chrome.browser.widget.ToolbarProgressBar

72 android:id="@+id/progress"	72 android:id="@+id/progress"

73 android:layout_width="match_parent"	73 android:layout_width="match_parent"

74 android:layout_height="@dimen/toolbar_progress_bar_height"	74 android:layout_height="@dimen/toolbar_progress_bar_height"

75 chrome:progressBarColor="@color/progress_bar_foreground"	75 chrome:progressBarColor="@color/progress_bar_foreground"

76 chrome:backgroundColor="@color/progress_bar_background" />	76 chrome:backgroundColor="@color/progress_bar_background" />

77	77

78 </merge>	78 </merge>

OLD	NEW