bluetooth: Add connected icon to Bluetooth Chooser on Android

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

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 cbbcd4b35319ae9aa253ec097daa451bcd8bbcbb..63a2f80d53a10df76fe42dcc6c0a17a9332d7814 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/BluetoothChooserDialog.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/BluetoothChooserDialog.java
@@ -11,11 +11,16 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
 import android.location.LocationManager;
+import android.support.graphics.drawable.VectorDrawableCompat;
+import android.support.v4.graphics.drawable.DrawableCompat;
 import android.text.SpannableString;
 import android.text.TextUtils;
 import android.view.View;
 
+import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.Log;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
@@ -67,6 +72,10 @@ public class BluetoothChooserDialog
     // bluetooth devices. For valid values see SecurityStateModel::SecurityLevel.
     int mSecurityLevel;
 
+    Drawable mConnectedIcon;

[Ted C, 2017/03/03 00:56:19]

any reason these aren't private?

[ortuno, 2017/03/03 22:08:22]

They were being used in tests but not anymore. Changed to private.

[Ted C, 2017/03/04 00:08:46]

If they need to be exposed for testing, they should be marked @VisibleForTesting
to make it more obvious the intent (vs being exposed for other classes in the
package to modify)

+    Drawable mConnectedSelectedIcon;
+    String mConnectedIconDescription;
+
     // A pointer back to the native part of the implementation for this dialog.
     long mNativeBluetoothChooserDialogPtr;
 
@@ -117,6 +126,17 @@ public class BluetoothChooserDialog
         mSecurityLevel = securityLevel;
         mNativeBluetoothChooserDialogPtr = nativeBluetoothChooserDialogPtr;
         mAdapter = BluetoothAdapter.getDefaultAdapter();
+
+        Resources res = mActivity.getResources();
+
+        // Initialize icons.
+        mConnectedIcon = VectorDrawableCompat.create(
+                res, R.drawable.ic_bluetooth_connected, mActivity.getTheme());
+        DrawableCompat.setTint(

[Ted C, 2017/03/03 00:56:19]

tints work on vectors now?

[ortuno, 2017/03/03 22:08:22]

They don't? I was assuming they did since they were part of DrawableCompat which
we use for Vectors. I tested on a M device and the colors were correct.

[Ted C, 2017/03/04 00:08:46]

If you have a K device it would be good to verify there, vectors were supported
natively later than that and maybe compat doesn't work (or it didn't in the
past).  It would be awesome if it works though!

[ortuno, 2017/03/08 06:57:37]

tldr; It works! Huzzah!

Web Bluetooth only works with L+ so I changed the code in
DownloadManagerUi.java[1] to test this. I tried the following two approaches:

// Using DrawableCompat.
Drawable downloads = VectorDrawableCompat.create(mActivity.getResources(),
    R.drawable.downloads_big, mActivity.getTheme());
downloads.mutate();
DrawableCompat.setTint(
    downloads,
    ApiCompatibilityUtils.getColor(mActivity.getResources(),
                                   android.R.color.white));
mSelectableListLayout.initializeEmptyView(
    downloads,
    R.string.download_manager_ui_empty,
    R.string.download_manager_no_results);



// Calling setTint on VectorDrawableCompat directly. (I had to suppress a lint
warning though).
VectorDrawableCompat downloads =
VectorDrawableCompat.create(mActivity.getResources(),
    R.drawable.downloads_big, mActivity.getTheme());
downloads.mutate();
downloads.setTint(ApiCompatibilityUtils.getColor(mActivity.getResources(),
android.R.color.black));
mSelectableListLayout.initializeEmptyView(
    downloads,
    R.string.download_manager_ui_empty,
    R.string.download_manager_no_results);

Both of them worked!

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

+                mConnectedIcon, ApiCompatibilityUtils.getColor(res, R.color.google_grey_600));
+        mConnectedSelectedIcon = getSelectedIcon(res, mConnectedIcon);
+        mConnectedIconDescription = mActivity.getString(R.string.bluetooth_device_connected);
+
         if (mAdapter == null) {
             Log.i(TAG, "BluetoothChooserDialog: Default Bluetooth adapter not found.");
         }
@@ -353,10 +373,29 @@ public class BluetoothChooserDialog
         return dialog;
     }
 
+    private Drawable getSelectedIcon(Resources res, Drawable drawable) {
+        Drawable selected = DrawableCompat.wrap(drawable.getConstantState().newDrawable());
+        selected.mutate();
+        DrawableCompat.setTint(
+                selected, ApiCompatibilityUtils.getColor(res, android.R.color.white));
+        return selected;
+    }
+
+    @VisibleForTesting
+    ItemChooserDialog.ItemChooserRowIcon createConnectedRowIcon() {
+        return new ItemChooserDialog.ItemChooserRowIcon(
+                mConnectedIcon, mConnectedSelectedIcon, mConnectedIconDescription);
+    }
+
     @VisibleForTesting
     @CalledByNative
-    void addOrUpdateDevice(String deviceId, String deviceName) {
-        mItemChooserDialog.addOrUpdateItem(deviceId, deviceName);
+    void addOrUpdateDevice(String deviceId, String deviceName, boolean isGATTConnected) {
+        ItemChooserDialog.ItemChooserRowIcon icon = null;
+        if (isGATTConnected) {
+            icon = createConnectedRowIcon();
+        }
+
+        mItemChooserDialog.addOrUpdateItem(deviceId, deviceName, icon);
     }
 
     @VisibleForTesting