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

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

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 location bar also know as URL bar -->

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

	8 <ImageView android:id="@+id/incognito_badge"

	9 style="@style/LocationBarButton"

	10 android:layout_width="wrap_content"

	11 android:layout_height="match_parent"

	12 android:scaleType="center"

	13 android:src="@drawable/ic_omnibox_incognito_badge"

	14 android:contentDescription="@null"

	15 android:visibility="gone" />

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

	17 android:layout_width="@dimen/location_bar_icon_width"

	18 android:layout_height="match_parent"

	19 android:visibility="gone">

	20 <ImageView android:id="@+id/navigation_button"

	21 style="@style/LocationBarButton"

	22 android:layout_width="match_parent"

	23 android:layout_height="match_parent"

	24 android:layout_gravity="center"

	25 android:scaleType="center"

	26 android:contentDescription="@null"/>

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

	28 style="@style/LocationBarButton"

	29 android:layout_height="match_parent"

	30 android:layout_width="match_parent"

	31 android:scaleType="center"

	32 android:layout_gravity="center"

	33 android:alpha="0"

	34 android:visibility="invisible"

	35 android:contentDescription="@string/accessibility_toolbar_btn_securi ty_lock" />

	36 </FrameLayout>

	37 <include

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

	39 android:layout_width="match_parent"

	40 android:layout_height="match_parent"

	41 android:layout_marginTop="3dp"

	42 android:layout_marginBottom="3dp"

	43 android:layout_marginStart="@dimen/location_bar_icon_width"

	44 android:layout_gravity="center_vertical"

	45 android:nextFocusForward="@+id/tab_switcher_button"

	46 layout="@layout/url_container"

	47 />

	48 <FrameLayout android:id="@+id/url_action_container"

	49 android:layout_width="@dimen/location_bar_icon_width"

	50 android:layout_height="@dimen/toolbar_height_no_shadow"

	51 android:layout_gravity="end\|center_vertical"

	52 android:visibility="gone">

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

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

	55 style="@style/LocationBarButton"

	56 android:layout_height="match_parent"

	57 android:layout_width="match_parent"

	58 android:src="@drawable/btn_menu"

	59 android:contentDescription="@string/accessibility_toolbar_btn_menu" />

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

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

	62 style="@style/LocationBarButton"

	63 android:layout_width="match_parent"

	64 android:layout_height="match_parent"

	65 android:scaleType="center"

	66 android:src="@drawable/btn_delete_url"

	67 android:visibility="invisible"

	68 android:contentDescription="@string/accessibility_toolbar_btn_delete _url" />

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

	70 android:id="@+id/mic_button"

	71 style="@style/LocationBarButton"

	72 android:layout_width="match_parent"

	73 android:layout_height="match_parent"

	74 android:scaleType="center"

	75 android:src="@drawable/btn_mic"

	76 android:visibility="invisible"

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

	78 </FrameLayout>

	79 </merge>

OLD	NEW