chrome/android/java_staging/res/layout-sw600dp/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-sw600dp/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-sw600dp/location_bar.xml ('k') | chrome/android/java_staging/res/layout-sw720dp/eb_main.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 <!-- The toolbar containing the URL bar, back button, and NTP button.

	7 -->

	8

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

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

	11 android:layout_width="match_parent"

	12 android:layout_height="@dimen/toolbar_height_no_shadow"

	13 android:layout_marginTop="@dimen/tab_strip_height"

	14 android:background="@color/default_primary_color" >

	15 <LinearLayout

	16 android:layout_width="match_parent"

	17 android:layout_height="match_parent"

	18 android:paddingStart="4dp"

	19 android:orientation="horizontal">

	20 <org.chromium.chrome.browser.toolbar.HomePageButton

	21 android:id="@+id/home_button"

	22 style="@style/ToolbarButton"

	23 android:src="@drawable/btn_toolbar_home"

	24 android:contentDescription="@string/accessibility_toolbar_btn_home"

	25 android:visibility="gone" />

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

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

	28 style="@style/ToolbarButton"

	29 android:src="@drawable/btn_back"

	30 android:contentDescription="@string/accessibility_toolbar_btn_back" />

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

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

	33 style="@style/ToolbarButton"

	34 android:src="@drawable/btn_forward"

	35 android:contentDescription="@string/accessibility_toolbar_btn_forwar d" />

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

	37 android:id="@+id/refresh_button"

	38 style="@style/ToolbarButton"

	39 android:src="@drawable/btn_toolbar_reload"

	40 android:contentDescription="@string/accessibility_btn_refresh" />

	41 <org.chromium.chrome.browser.omnibox.LocationBarTablet

	42 android:id="@+id/location_bar"

	43 android:layout_width="0dp"

	44 android:layout_height="match_parent"

	45 android:layout_marginBottom="5dp"

	46 android:layout_marginTop="5dp"

	47 android:layout_weight="1"

	48 android:layout_gravity="top\|center"

	49 android:background="@drawable/textbox"

	50 android:paddingEnd="1dp"

	51 android:paddingStart="2dp"

	52 />

	53 <ImageButton

	54 android:id="@+id/tab_switcher_button"

	55 style="@style/ToolbarButton"

	56 android:contentDescription="@string/accessibility_toolbar_btn_tabswi tcher_toggle"

	57 android:visibility="gone" />

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

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

	60 style="@style/ToolbarButton"

	61 android:src="@drawable/btn_menu"

	62 android:contentDescription="@string/accessibility_toolbar_btn_menu"

	63 android:layout_width="43dp"

	64 android:paddingEnd="3.5dp" />

	65 </LinearLayout>

	66 </org.chromium.chrome.browser.toolbar.ToolbarTablet>

OLD	NEW