chrome/android/java/src/org/chromium/chrome/browser/UsbChooserDialog.java - Issue 2175613004: Add code back to change the status of WebBluetooth chooser once discovery is complete

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/src/org/chromium/chrome/browser/UsbChooserDialog.java

Issue 2175613004: Add code back to change the status of WebBluetooth chooser once discovery is complete (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: added code back to change the status of WebBluetooth chooser once discovery is complete 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/src/org/chromium/chrome/browser/ItemChooserDialog.java ('k') | chrome/android/java/strings/android_chrome_strings.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/UsbChooserDialog.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/UsbChooserDialog.java b/chrome/android/java/src/org/chromium/chrome/browser/UsbChooserDialog.java

index 6513cd92b27fa811703663f1e8e99182b604533a..9aafe06006adf89dbda5819dc5772db4a6315dbf 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/UsbChooserDialog.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/UsbChooserDialog.java

@@ -67,7 +67,7 @@ public class UsbChooserDialog implements ItemChooserDialog.ItemSelectedCallback

String searching = "";

String noneFound = activity.getString(R.string.usb_chooser_dialog_no_devices_found_prompt);

- SpannableString statusIdleNoneFound =

+ SpannableString statusActive =

SpanApplier.applySpans(

activity.getString(R.string.usb_chooser_dialog_footnote_text),

new SpanInfo("<link>", "</link>", new NoUnderlineClickableSpan() {

@@ -83,11 +83,12 @@ public class UsbChooserDialog implements ItemChooserDialog.ItemSelectedCallback

view.invalidate();

}

}));

- SpannableString statusIdleSomeFound = statusIdleNoneFound;

+ SpannableString statusIdleNoneFound = statusActive;

+ SpannableString statusIdleSomeFound = statusActive;

String positiveButton = activity.getString(R.string.usb_chooser_dialog_connect_button_text);

ItemChooserDialog.ItemChooserLabels labels =

- new ItemChooserDialog.ItemChooserLabels(title, searching, noneFound,

+ new ItemChooserDialog.ItemChooserLabels(title, searching, noneFound, statusActive,

statusIdleNoneFound, statusIdleSomeFound, positiveButton);

mItemChooserDialog = new ItemChooserDialog(activity, this, labels);

}