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 c3bece95d76975a4215614bab331ec18decdc769..05077f5cefa4624b0b5440be91f64eda724dbff9 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/BluetoothChooserDialog.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/BluetoothChooserDialog.java |
@@ -46,6 +46,18 @@ public class BluetoothChooserDialog |
static final int DIALOG_FINISHED_CANCELLED = 1; |
static final int DIALOG_FINISHED_SELECTED = 2; |
+ private static final int SIGNAL_STRENGTH_ICONS[][] = |
+ new int[][] {{R.drawable.ic_signal_cellular_0_bar_grey600_24dp, |
+ R.drawable.ic_signal_cellular_0_bar_white_24dp}, |
+ {R.drawable.ic_signal_cellular_1_bar_grey600_24dp, |
+ R.drawable.ic_signal_cellular_1_bar_white_24dp}, |
+ {R.drawable.ic_signal_cellular_2_bar_grey600_24dp, |
+ R.drawable.ic_signal_cellular_2_bar_white_24dp}, |
+ {R.drawable.ic_signal_cellular_3_bar_grey600_24dp, |
+ R.drawable.ic_signal_cellular_3_bar_white_24dp}, |
+ {R.drawable.ic_signal_cellular_4_bar_grey600_24dp, |
+ R.drawable.ic_signal_cellular_4_bar_white_24dp}}; |
+ |
// The window that owns this dialog. |
final WindowAndroid mWindowAndroid; |
@@ -337,9 +349,18 @@ public class BluetoothChooserDialog |
@VisibleForTesting |
@CalledByNative |
- void addOrUpdateDevice(String deviceId, String deviceName) { |
- mItemChooserDialog.addOrUpdateItem( |
- new ItemChooserDialog.ItemChooserRow(deviceId, deviceName)); |
+ void addOrUpdateDevice(String deviceId, String deviceName, int signalStrengthLevel) { |
+ ItemChooserDialog.ItemChooserRowIcon signalStrengthLevelIcon = null; |
+ assert 0 <= signalStrengthLevel && signalStrengthLevel <= 4; |
juncai
2016/09/12 20:05:49
I think this assert needs to be moved inside the f
ortuno
2016/09/13 03:00:45
Made the first condition -1.
|
+ if (signalStrengthLevel != -1) { |
+ int iconPair[] = SIGNAL_STRENGTH_ICONS[signalStrengthLevel]; |
+ signalStrengthLevelIcon = new ItemChooserDialog.ItemChooserRowIcon( |
+ iconPair[0], iconPair[1], mActivity.getResources().getQuantityString( |
+ R.plurals.signal_strength_level_n_bars, |
+ signalStrengthLevel, signalStrengthLevel)); |
+ } |
+ mItemChooserDialog.addOrUpdateItem(new ItemChooserDialog.ItemChooserRow( |
+ deviceId, deviceName, signalStrengthLevelIcon)); |
} |
@VisibleForTesting |