Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(922)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/BluetoothChooserDialog.java

Issue 2590663002: Remove duplicate string constants for Web Bluetooth chooser on Android (Closed)
Patch Set: remove duplicate string constants for Web Bluetooth chooser on Android Created 4 years 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 | « no previous file | chrome/android/java/strings/android_chrome_strings.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/src/org/chromium/chrome/browser/BluetoothChooserDialog.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/BluetoothChooserDialog.java b/chrome/android/java/src/org/chromium/chrome/browser/BluetoothChooserDialog.java
index f5b050b26de67e27a2f5ed870371e295ffa57730..9bee553b1e10ce710b8af1fe7d70d2301f97be1a 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/BluetoothChooserDialog.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/BluetoothChooserDialog.java
@@ -133,24 +133,16 @@ public class BluetoothChooserDialog
String positiveButton = mActivity.getString(R.string.bluetooth_confirm_button);
- SpannableString statusIdleNoneFound = SpanApplier.applySpans(
- mActivity.getString(R.string.bluetooth_not_seeing_it_idle_none_found),
- new SpanInfo("<link1>", "</link1>",
- new BluetoothClickableSpan(LinkType.EXPLAIN_BLUETOOTH, mActivity)),
- new SpanInfo("<link2>", "</link2>",
- new BluetoothClickableSpan(LinkType.RESTART_SEARCH, mActivity)));
-
- SpannableString statusActive = SpanApplier.applySpans(
- mActivity.getString(R.string.bluetooth_not_seeing_it),
- new SpanInfo("<link>", "</link>",
- new BluetoothClickableSpan(LinkType.EXPLAIN_BLUETOOTH, mActivity)));
+ SpannableString statusIdleNoneFound =
+ SpanApplier.applySpans(mActivity.getString(R.string.bluetooth_not_seeing_it_idle),
+ new SpanInfo("<link1>", "</link1>",
+ new BluetoothClickableSpan(LinkType.EXPLAIN_BLUETOOTH, mActivity)),
+ new SpanInfo("<link2>", "</link2>",
+ new BluetoothClickableSpan(LinkType.RESTART_SEARCH, mActivity)));
+
+ SpannableString statusActive = searching;
- SpannableString statusIdleSomeFound = SpanApplier.applySpans(
- mActivity.getString(R.string.bluetooth_not_seeing_it_idle_some_found),
- new SpanInfo("<link1>", "</link1>",
- new BluetoothClickableSpan(LinkType.EXPLAIN_BLUETOOTH, mActivity)),
- new SpanInfo("<link2>", "</link2>",
- new BluetoothClickableSpan(LinkType.RESTART_SEARCH, mActivity)));
+ SpannableString statusIdleSomeFound = statusIdleNoneFound;
ItemChooserDialog.ItemChooserLabels labels =
new ItemChooserDialog.ItemChooserLabels(title, searching, noneFound, statusActive,
« no previous file with comments | « no previous file | chrome/android/java/strings/android_chrome_strings.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698