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..d34ae7f9e96f78aec6dfe095a8e1dedbd9f4eba9 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,29 @@ public class BluetoothChooserDialog |
static final int DIALOG_FINISHED_CANCELLED = 1; |
static final int DIALOG_FINISHED_SELECTED = 2; |
+ private static final ItemChooserDialog.ItemChooserRowIcon |
+ SIGNAL_STRENGTH_ICONS[] = new ItemChooserDialog.ItemChooserRowIcon[] { |
+ new ItemChooserDialog.ItemChooserRowIcon( |
+ R.drawable.ic_signal_cellular_0_bar_black_48dp, |
juncai
2016/08/26 19:37:48
Are the signal strength icon images added in diffe
ortuno
2016/09/12 05:11:27
Each directory has a copy of the image in a differ
juncai
2016/09/12 20:05:49
ah, I see. Thanks!
|
+ R.drawable.ic_signal_cellular_0_bar_white_48dp, |
juncai
2016/08/26 19:37:48
The filename probably doesn't need to include "48d
ortuno
2016/09/12 05:11:27
They all have the same dp so I think the name is a
juncai
2016/09/12 20:05:49
Acknowledged.
|
+ "Signal Strengh Level: Lowest"), |
juncai
2016/08/26 19:37:48
typo:
s/Strengh/Strength
ortuno
2016/09/12 05:11:27
Done.
|
+ new ItemChooserDialog.ItemChooserRowIcon( |
+ R.drawable.ic_signal_cellular_1_bar_black_48dp, |
+ R.drawable.ic_signal_cellular_1_bar_white_48dp, |
+ "Signal Strengh Level: Lower"), |
juncai
2016/08/26 19:37:48
How about naming them something more straightforwa
ortuno
2016/09/12 05:11:27
Ahh good idea. That also reminded me to not hard c
|
+ new ItemChooserDialog.ItemChooserRowIcon( |
+ R.drawable.ic_signal_cellular_2_bar_black_48dp, |
+ R.drawable.ic_signal_cellular_2_bar_white_48dp, |
juncai
2016/08/26 19:37:48
As I understand, the black image is for item not s
ortuno
2016/09/12 05:11:27
Done.
|
+ "Signal Strengh Level: Low"), |
+ new ItemChooserDialog.ItemChooserRowIcon( |
+ R.drawable.ic_signal_cellular_3_bar_black_48dp, |
+ R.drawable.ic_signal_cellular_3_bar_white_48dp, |
+ "Signal Strengh Level: Medium"), |
+ new ItemChooserDialog.ItemChooserRowIcon( |
+ R.drawable.ic_signal_cellular_4_bar_black_48dp, |
+ R.drawable.ic_signal_cellular_4_bar_white_48dp, |
+ "Signal Strengh Level: High")}; |
+ |
// The window that owns this dialog. |
final WindowAndroid mWindowAndroid; |
@@ -337,9 +360,10 @@ 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) { |
+ mItemChooserDialog.addOrUpdateItem(new ItemChooserDialog.ItemChooserRow(deviceId, |
+ deviceName, |
+ signalStrengthLevel == -1 ? null : SIGNAL_STRENGTH_ICONS[signalStrengthLevel])); |
juncai
2016/08/26 19:37:48
maybe add some assert to make sure |signalStrength
ortuno
2016/09/12 05:11:27
Done.
|
} |
@VisibleForTesting |