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

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

Unified Diff: chrome/android/java_staging/res/layout/url_container.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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/java_staging/res/layout/toolbar.xml ('k') | chrome/android/java_staging/res/layout/webapp_control_container.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java_staging/res/layout/url_container.xml

diff --git a/chrome/android/java_staging/res/layout/url_container.xml b/chrome/android/java_staging/res/layout/url_container.xml

deleted file mode 100644

index eed7b5735f1ef1cbda809fb017a9f485ebe9e3f4..0000000000000000000000000000000000000000

--- a/chrome/android/java_staging/res/layout/url_container.xml

+++ /dev/null

@@ -1,36 +0,0 @@

-<?xml version="1.0" encoding="utf-8"?>

- Use of this source code is governed by a BSD-style license that can be

- found in the LICENSE file. -->

-

-<org.chromium.chrome.browser.omnibox.UrlContainer

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

- android:layout_width="match_parent"

- android:layout_height="wrap_content">

- <org.chromium.chrome.browser.omnibox.UrlBar

- android:id="@+id/url_bar"

- android:background="@null"

- android:layout_width="match_parent"

- android:layout_height="match_parent"

- android:gravity="center_vertical"

- android:singleLine="true"

- android:imeOptions="actionGo|flagNoExtractUi|flagNoFullscreen"

- android:textSize="@dimen/location_bar_url_text_size"

- android:inputType="textUri"

- android:hint="@string/search_or_type_url" />

- <org.chromium.chrome.browser.omnibox.TrailingTextView

- android:id="@+id/trailing_text"

- android:layout_width="0dp"

- android:layout_height="0dp"

- android:gravity="center_vertical"

- android:background="@null"

- android:singleLine="true"

- android:ellipsize="none"

- android:fadingEdge="horizontal"

- android:fadingEdgeLength="15dp"

- android:visibility="gone"

- android:textColor="@color/url_emphasis_non_emphasized_text"

- android:textSize="@dimen/location_bar_url_text_size"

- android:contentDescription="@null" />

-</org.chromium.chrome.browser.omnibox.UrlContainer>