chrome/android/java/res/layout/usb_permission.xml - Issue 2170123002: Reland: Add USB device permissions to individual site settings on Android.

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

Issue 2170123002: Reland: Add USB device permissions to individual site settings on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Resolved merge conflict. Created 4 years, 5 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/res/drawable-xxxhdpi/settings_usb.png ('k') | chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/res/layout/usb_permission.xml

diff --git a/chrome/android/java/res/layout/payments_request_editor_textview.xml b/chrome/android/java/res/layout/usb_permission.xml

similarity index 57%

copy from chrome/android/java/res/layout/payments_request_editor_textview.xml

copy to chrome/android/java/res/layout/usb_permission.xml

index db89d5b0d4e4e0e6e5f62b0c0cd72f79b1f80df2..f502c39d0475b64cc3d75eee5904d9f75aa5a18a 100644

--- a/chrome/android/java/res/layout/payments_request_editor_textview.xml

+++ b/chrome/android/java/res/layout/usb_permission.xml

@@ -3,10 +3,10 @@

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

found in the LICENSE file. -->

-<AutoCompleteTextView

+<ImageView

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

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

- android:layout_width="match_parent"

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

+ android:layout_width="wrap_content"

android:layout_height="wrap_content"

- android:singleLine="true"

- android:imeOptions="flagNoExtractUi" />

+ android:contentDescription="@string/website_settings_revoke_device_permission"

+ android:src="@drawable/btn_close" />