chrome/android/java/res/layout/toolbar.xml - Issue 1178323005: Move remaining resources from java_staging/res to java/res.

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.xml

Issue 1178323005: Move remaining resources from java_staging/res to java/res. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@res_default

Patch Set: renamed conflicting resource in chrome shell Created 5 years, 6 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/snack_bar.xml ('k') | chrome/android/java/res/layout/url_container.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 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	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	8

9 <org.chromium.chrome.browser.toolbar.ToolbarPhone	9 <org.chromium.chrome.browser.toolbar.ToolbarPhone

10 xmlns:android="http://schemas.android.com/apk/res/android"	10 xmlns:android="http://schemas.android.com/apk/res/android"

(...skipping 47 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
58 android:background="@null" />	58 android:background="@null" />

59 </LinearLayout>	59 </LinearLayout>

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

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

62 style="@style/Widget.AppCompat.ProgressBar.Horizontal"	62 style="@style/Widget.AppCompat.ProgressBar.Horizontal"

63 android:progressDrawable="@drawable/progress_bar"	63 android:progressDrawable="@drawable/progress_bar"

64 android:layout_width="match_parent"	64 android:layout_width="match_parent"

65 android:layout_height="2dp"	65 android:layout_height="2dp"

66 android:progress="0" />	66 android:progress="0" />

67 </org.chromium.chrome.browser.toolbar.ToolbarPhone>	67 </org.chromium.chrome.browser.toolbar.ToolbarPhone>

OLD	NEW