bluetooth: Implement RSSI indicator on android

chrome/android/java/src/org/chromium/chrome/browser/BluetoothChooserDialog.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser;
 
 import android.Manifest;
 import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.res.Resources;
 import android.location.LocationManager;
+import android.support.graphics.drawable.VectorDrawableCompat;
 import android.text.SpannableString;
 import android.text.TextUtils;
 import android.view.View;
 
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.omnibox.OmniboxUrlEmphasizer;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.components.location.LocationUtils;
@@ skipping 32 matching lines @@
     // The dialog to show to let the user pick a device.
     ItemChooserDialog mItemChooserDialog;
 
     // The origin for the site wanting to pair with the bluetooth devices.
     String mOrigin;
 
     // The security level of the connection to the site wanting to pair with the
     // bluetooth devices. For valid values see SecurityStateModel::SecurityLevel.
     int mSecurityLevel;
 
+    ItemChooserDialog.ItemChooserRowIcon[] mSignalStrengthLevelRowIcons;
+
     // A pointer back to the native part of the implementation for this dialog.
     long mNativeBluetoothChooserDialogPtr;
 
     // Used to keep track of when the Mode Changed Receiver is registered.
     boolean mIsLocationModeChangedReceiverRegistered = false;
 
     @VisibleForTesting
     final BroadcastReceiver mLocationModeBroadcastReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
@@ skipping 23 matching lines @@
      */
     @VisibleForTesting
     BluetoothChooserDialog(WindowAndroid windowAndroid, String origin, int securityLevel,
             long nativeBluetoothChooserDialogPtr) {
         mWindowAndroid = windowAndroid;
         mActivity = windowAndroid.getActivity().get();
         assert mActivity != null;
         mOrigin = origin;
         mSecurityLevel = securityLevel;
         mNativeBluetoothChooserDialogPtr = nativeBluetoothChooserDialogPtr;
+        Resources resources = mActivity.getResources();
+        mSignalStrengthLevelRowIcons = new ItemChooserDialog.ItemChooserRowIcon[] {
+                new ItemChooserDialog.ItemChooserRowIcon(
+                        VectorDrawableCompat.create(resources,
+                                R.drawable.ic_signal_cellular_0_bar_grey600_24dp, null /* theme */),

[Ian Wen, 2016/09/26 18:12:48]

Maybe remove /* */? This comment style is not commonly seen in Chrome's Java
code.

[ortuno, 2016/10/04 07:16:18]

If it's OK with you I would rather keep this. There are a couple of examples
throughout the code base and I believe it does improve readability.

https://cs.chromium.org/chromium/src/chrome/test/android/javatests/src/org/ch...

https://cs.chromium.org/chromium/src/chrome/android/java/src/org/chromium/chr...

https://cs.chromium.org/chromium/src/chrome/android/java/src/org/chromium/chr...

Though I do think the argument of consistency is stronger so up to you.

+                        VectorDrawableCompat.create(resources,
+                                R.drawable.ic_signal_cellular_0_bar_white_24dp, null /* theme */),
+                        resources.getQuantityString(R.plurals.signal_strength_level_n_bars, 0, 0)),

[Ian Wen, 2016/09/27 04:22:41]

Thanks for making our product more accessible by adding the content
descriptions!

For this case though, the label should be representative enough of the item, and
the content description should not be needed. In general we do not include
content description  for compound drawables in textview, because the textview
speaks its own word. https://blog.stylingandroid.com/compound-drawable/

[ortuno, 2016/10/04 07:16:18]

As mentioned offline (I think?) the image adds more information about the item,
information that is not available elsewhere so we keep the descriptions.

+                new ItemChooserDialog.ItemChooserRowIcon(
+                        VectorDrawableCompat.create(resources,
+                                R.drawable.ic_signal_cellular_1_bar_grey600_24dp, null /* theme */),
+                        VectorDrawableCompat.create(resources,
+                                R.drawable.ic_signal_cellular_1_bar_white_24dp, null /* theme */),
+                        resources.getQuantityString(R.plurals.signal_strength_level_n_bars, 1, 1)),
+                new ItemChooserDialog.ItemChooserRowIcon(
+                        VectorDrawableCompat.create(resources,
+                                R.drawable.ic_signal_cellular_2_bar_grey600_24dp, null /* theme */),
+                        VectorDrawableCompat.create(resources,
+                                R.drawable.ic_signal_cellular_2_bar_white_24dp, null /* theme */),
+                        resources.getQuantityString(R.plurals.signal_strength_level_n_bars, 2, 2)),
+                new ItemChooserDialog.ItemChooserRowIcon(
+                        VectorDrawableCompat.create(resources,
+                                R.drawable.ic_signal_cellular_3_bar_grey600_24dp, null /* theme */),
+                        VectorDrawableCompat.create(resources,
+                                R.drawable.ic_signal_cellular_3_bar_white_24dp, null /* theme */),
+                        resources.getQuantityString(R.plurals.signal_strength_level_n_bars, 3, 3)),
+                new ItemChooserDialog.ItemChooserRowIcon(
+                        VectorDrawableCompat.create(resources,
+                                R.drawable.ic_signal_cellular_4_bar_grey600_24dp, null /* theme */),
+                        VectorDrawableCompat.create(resources,
+                                R.drawable.ic_signal_cellular_4_bar_white_24dp, null /* theme */),
+                        resources.getQuantityString(R.plurals.signal_strength_level_n_bars, 4, 4))};
     }
 
     /**
      * Show the BluetoothChooserDialog.
      */
     @VisibleForTesting
     void show() {
         // Emphasize the origin.
         Profile profile = Profile.getLastUsedProfile();
         SpannableString origin = new SpannableString(mOrigin);
@@ skipping 30 matching lines @@
         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)));
 
         ItemChooserDialog.ItemChooserLabels labels =
                 new ItemChooserDialog.ItemChooserLabels(title, searching, noneFound, statusActive,
                         statusIdleNoneFound, statusIdleSomeFound, positiveButton);
-        mItemChooserDialog = new ItemChooserDialog(mActivity, this, labels);
+        mItemChooserDialog = new ItemChooserDialog(mActivity, this, labels, true /* usingIcon */);
 
         mActivity.registerReceiver(mLocationModeBroadcastReceiver,
                 new IntentFilter(LocationManager.MODE_CHANGED_ACTION));
         mIsLocationModeChangedReceiverRegistered = true;
     }
 
+    ItemChooserDialog.ItemChooserRowIcon[] getSignalStrengthLevelRowIcons() {
+        return mSignalStrengthLevelRowIcons;
+    }
+
     // Called to report the dialog's results back to native code.
     private void finishDialog(int resultCode, String id) {
         if (mIsLocationModeChangedReceiverRegistered) {
             mActivity.unregisterReceiver(mLocationModeBroadcastReceiver);
             mIsLocationModeChangedReceiverRegistered = false;
         }
 
         if (mNativeBluetoothChooserDialogPtr != 0) {
             nativeOnDialogFinished(mNativeBluetoothChooserDialogPtr, resultCode, id);
         }
@@ skipping 154 matching lines @@
             return null;
         }
         BluetoothChooserDialog dialog = new BluetoothChooserDialog(
                 windowAndroid, origin, securityLevel, nativeBluetoothChooserDialogPtr);
         dialog.show();
         return dialog;
     }
 
     @VisibleForTesting
     @CalledByNative
-    void addOrUpdateDevice(String deviceId, String deviceName) {
-        mItemChooserDialog.addOrUpdateItem(
-                new ItemChooserDialog.ItemChooserRow(deviceId, deviceName));
+    void addOrUpdateDevice(String deviceId, String deviceName, int signalStrengthLevel) {
+        assert -1 <= signalStrengthLevel
+                && signalStrengthLevel < mSignalStrengthLevelRowIcons.length;
+        ItemChooserDialog.ItemChooserRowIcon signalStrengthLevelIcon = null;
+        if (signalStrengthLevel != -1) {
+            signalStrengthLevelIcon = mSignalStrengthLevelRowIcons[signalStrengthLevel];
+        }
+        mItemChooserDialog.addOrUpdateItem(new ItemChooserDialog.ItemChooserRow(
+                deviceId, deviceName, signalStrengthLevelIcon));
     }
 
     @VisibleForTesting
     @CalledByNative
     void closeDialog() {
         mNativeBluetoothChooserDialogPtr = 0;
         mItemChooserDialog.dismiss();
     }
 
     @VisibleForTesting
@@ skipping 50 matching lines @@
     @VisibleForTesting
     native void nativeRestartSearch(long nativeBluetoothChooserAndroid);
     // Help links.
     @VisibleForTesting
     native void nativeShowBluetoothOverviewLink(long nativeBluetoothChooserAndroid);
     @VisibleForTesting
     native void nativeShowBluetoothAdapterOffLink(long nativeBluetoothChooserAndroid);
     @VisibleForTesting
     native void nativeShowNeedLocationPermissionLink(long nativeBluetoothChooserAndroid);
 }