chrome/android/java/res/layout-sw600dp/location_bar.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-sw600dp/location_bar.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-sw600dp/find_toolbar.xml ('k') | chrome/android/java/res/layout-sw600dp/toolbar.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 location bar also know as URL bar -->	6 <!-- The location bar also know as URL bar -->

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

8 <FrameLayout android:id="@+id/location_bar_icon"	8 <FrameLayout android:id="@+id/location_bar_icon"

9 android:layout_width="@dimen/location_bar_icon_width"	9 android:layout_width="@dimen/location_bar_icon_width"

10 android:layout_height="match_parent"	10 android:layout_height="match_parent"

(...skipping 57 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
68 android:layout_width="40dp"	68 android:layout_width="40dp"

69 android:layout_height="match_parent"	69 android:layout_height="match_parent"

70 android:scaleType="center"	70 android:scaleType="center"

71 android:layout_gravity="end"	71 android:layout_gravity="end"

72 android:paddingStart="0dp"	72 android:paddingStart="0dp"

73 android:paddingEnd="0dp"	73 android:paddingEnd="0dp"

74 android:nextFocusForward="@+id/menu_button"	74 android:nextFocusForward="@+id/menu_button"

75 android:src="@drawable/btn_mic"	75 android:src="@drawable/btn_mic"

76 android:contentDescription="@string/accessibility_toolbar_btn_mic" />	76 android:contentDescription="@string/accessibility_toolbar_btn_mic" />

77 </merge>	77 </merge>

OLD	NEW