chrome/android/java_staging/res/layout/hosted_toolbar.xml - Issue 1141283003: Upstream oodles of Chrome for Android code into Chromium.

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_staging/res/layout/hosted_toolbar.xml

Issue 1141283003: Upstream oodles of Chrome for Android code into Chromium. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: final patch? Created 5 years, 7 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_staging/res/layout/hosted_control_container.xml ('k') | chrome/android/java_staging/res/layout/icon_most_visited_item.xml » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
(Empty)
	1 <?xml version="1.0" encoding="utf-8"?>

	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

	4 found in the LICENSE file. -->

	5

	6 <org.chromium.chrome.browser.toolbar.HostedToolbar xmlns:android="http://schemas .android.com/apk/res/android">

	7 <org.chromium.chrome.browser.widget.TintedImageButton

	8 android:id="@+id/back_button"

	9 style="@style/ToolbarButton"

	10 android:layout_gravity="center_vertical"

	11 android:src="@drawable/btn_chevron_left" />

	12 <ImageButton android:id="@+id/security_button"

	13 style="@style/LocationBarButton"

	14 android:layout_width="@dimen/location_bar_icon_width"

	15 android:layout_height="match_parent"

	16 android:layout_marginStart="48dp"

	17 android:scaleType="center"

	18 android:layout_gravity="center_vertical"

	19 android:alpha="0"

	20 android:visibility="gone"

	21 android:contentDescription="@string/accessibility_toolbar_btn_security_l ock" />

	22 <include

	23 android:id="@+id/url_container"

	24 android:layout_width="wrap_content"

	25 android:layout_height="match_parent"

	26 android:layout_marginTop="3dp"

	27 android:layout_marginBottom="3dp"

	28 android:layout_gravity="center_vertical"

	29 layout="@layout/url_container"

	30 />

	31 <ImageButton

	32 android:id="@+id/action_button"

	33 style="@style/ToolbarButton"

	34 android:layout_marginEnd="42dp"

	35 android:layout_gravity="center_vertical\|end"

	36 android:visibility="gone"

	37 android:contentDescription="@string/accessibility_toolbar_btn_custom" />

	38 <org.chromium.chrome.browser.widget.TintedImageButton

	39 android:id="@+id/menu_button"

	40 style="@style/ToolbarButton"

	41 android:layout_gravity="center_vertical\|end"

	42 android:layout_width="42dp"

	43 android:paddingEnd="4dp"

	44 android:src="@drawable/btn_menu"

	45 android:contentDescription="@string/accessibility_toolbar_btn_menu"

	46 android:background="@null" />

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

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

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

	50 android:progressDrawable="@drawable/progress_bar"

	51 android:layout_width="match_parent"

	52 android:layout_height="2dp"

	53 android:progress="0" />

	54 </org.chromium.chrome.browser.toolbar.HostedToolbar>

OLD	NEW