WebUsb Android chooser UI

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.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.graphics.Color;
 import android.text.SpannableString;
-import android.text.TextPaint;
 import android.text.TextUtils;
-import android.text.style.ClickableSpan;
 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.ui.base.WindowAndroid;
+import org.chromium.ui.text.NoUnderlineClickableSpan;
 import org.chromium.ui.text.SpanApplier;
 import org.chromium.ui.text.SpanApplier.SpanInfo;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * A dialog for picking available Bluetooth devices. This dialog is shown when a website requests to
  * pair with a certain class of Bluetooth devices (e.g. through a bluetooth.requestDevice Javascript
  * call).
  */
 public class BluetoothChooserDialog
         implements ItemChooserDialog.ItemSelectedCallback, WindowAndroid.PermissionCallback {
     // These constants match BluetoothChooserAndroid::ShowDiscoveryState, and are used in
     // notifyDiscoveryState().
     static final int DISCOVERY_FAILED_TO_START = 0;
@@ skipping 29 matching lines @@
     private enum LinkType {
         EXPLAIN_BLUETOOTH,
         ADAPTER_OFF,
         ADAPTER_OFF_HELP,
         REQUEST_LOCATION_PERMISSION,
         NEED_LOCATION_PERMISSION_HELP,
         RESTART_SEARCH,
     }
 
     /**
-     * Creates the BluetoothChooserDialog and displays it (and starts waiting for data).
-     *
-     * @param context Context which is used for launching a dialog.
+     * Creates the BluetoothChooserDialog.
      */
     @VisibleForTesting
     BluetoothChooserDialog(WindowAndroid windowAndroid, String origin, int securityLevel,
             long nativeBluetoothChooserDialogPtr) {
         mWindowAndroid = windowAndroid;
         mContext = windowAndroid.getActivity().get();
         assert mContext != null;
         mOrigin = origin;
         mSecurityLevel = securityLevel;
         mNativeBluetoothChooserDialogPtr = nativeBluetoothChooserDialogPtr;
@@ skipping 11 matching lines @@
                 origin, mContext.getResources(), profile, mSecurityLevel, false, true, true);
         // Construct a full string and replace the origin text with emphasized version.
         SpannableString title =
                 new SpannableString(mContext.getString(R.string.bluetooth_dialog_title, mOrigin));
         int start = title.toString().indexOf(mOrigin);
         TextUtils.copySpansFrom(origin, 0, origin.length(), Object.class, title, start);
 
         String message = mContext.getString(R.string.bluetooth_not_found);
         SpannableString noneFound = SpanApplier.applySpans(
                 message, new SpanInfo("<link>", "</link>",
-                        new NoUnderlineClickableSpan(LinkType.RESTART_SEARCH, mContext)));
+                        new BluetoothClickableSpan(LinkType.RESTART_SEARCH, mContext)));
 
         SpannableString searching = SpanApplier.applySpans(
                 mContext.getString(R.string.bluetooth_searching),
-                new SpanInfo("<link>", "</link>",
-                        new NoUnderlineClickableSpan(LinkType.EXPLAIN_BLUETOOTH, mContext)));
+                        new SpanInfo("<link>", "</link>",

[newt (away), 2016/03/17 01:53:20]

nit: The indentation was correct to begin with (before your CL). No need to
change it :)

The rule is: indent by 8 when wrapping. Additional lines don't need extra
indentation unless they're wrapped inside an additional level of parentheses.

Also, Eclipse will generally get the indentation correct for you. Just highlight
the code you want to format and press Ctrl+Shift+F. (I don't recommend
Ctrl+Shift+F on an entire file though, as it can sometimes reformat things that
shouldn't be changed. One day, hopefully, we'll have a tool like clang-format or
go format that "just works" for Java).

[juncai, 2016/03/17 18:21:35]

Done.

+                                new BluetoothClickableSpan(LinkType.EXPLAIN_BLUETOOTH, mContext)));
 
         String positiveButton = mContext.getString(R.string.bluetooth_confirm_button);
 
-        SpannableString statusActive = SpanApplier.applySpans(
-                mContext.getString(R.string.bluetooth_not_seeing_it),
-                new SpanInfo("<link>", "</link>",
-                        new NoUnderlineClickableSpan(LinkType.EXPLAIN_BLUETOOTH, mContext)));
-
         SpannableString statusIdleNoneFound = SpanApplier.applySpans(
                 mContext.getString(R.string.bluetooth_not_seeing_it_idle_none_found),
-                new SpanInfo("<link>", "</link>",
-                        new NoUnderlineClickableSpan(LinkType.EXPLAIN_BLUETOOTH, mContext)));
+                        new SpanInfo("<link>", "</link>",
+                                new BluetoothClickableSpan(LinkType.EXPLAIN_BLUETOOTH, mContext)));
 
         SpannableString statusIdleSomeFound = SpanApplier.applySpans(
                 mContext.getString(R.string.bluetooth_not_seeing_it_idle_some_found),
                 new SpanInfo("<link1>", "</link1>",
-                        new NoUnderlineClickableSpan(LinkType.EXPLAIN_BLUETOOTH, mContext)),
-                new SpanInfo("<link2>", "</link2>",
-                        new NoUnderlineClickableSpan(LinkType.RESTART_SEARCH, mContext)));
+                        new BluetoothClickableSpan(LinkType.EXPLAIN_BLUETOOTH, mContext)),
+                        new SpanInfo("<link2>", "</link2>",
+                        new BluetoothClickableSpan(LinkType.RESTART_SEARCH, mContext)));
 
         ItemChooserDialog.ItemChooserLabels labels =
-                new ItemChooserDialog.ItemChooserLabels(title, searching, noneFound, statusActive,
+                new ItemChooserDialog.ItemChooserLabels(title, searching, noneFound,
                         statusIdleNoneFound, statusIdleSomeFound, positiveButton);
         mItemChooserDialog = new ItemChooserDialog(mContext, this, labels);
     }
 
     @Override
     public void onItemSelected(String id) {
         if (mNativeBluetoothChooserDialogPtr != 0) {
             if (id.isEmpty()) {
                 nativeOnDialogFinished(
                         mNativeBluetoothChooserDialogPtr, DIALOG_FINISHED_CANCELLED, "");
@@ skipping 30 matching lines @@
             if (mNativeBluetoothChooserDialogPtr != 0) {
                 nativeOnDialogFinished(
                         mNativeBluetoothChooserDialogPtr, DIALOG_FINISHED_DENIED_PERMISSION, "");
                 return;
             }
         }
 
         SpannableString needLocationMessage = SpanApplier.applySpans(
                 mContext.getString(R.string.bluetooth_need_location_permission),
                 new SpanInfo("<link>", "</link>",
-                        new NoUnderlineClickableSpan(
+                        new BluetoothClickableSpan(
                                      LinkType.REQUEST_LOCATION_PERMISSION, mContext)));
 
         SpannableString needLocationStatus = SpanApplier.applySpans(
                 mContext.getString(R.string.bluetooth_need_location_permission_help),
                 new SpanInfo("<link>", "</link>",
-                        new NoUnderlineClickableSpan(
+                        new BluetoothClickableSpan(
                                      LinkType.NEED_LOCATION_PERMISSION_HELP, mContext)));
 
         mItemChooserDialog.setErrorState(needLocationMessage, needLocationStatus);
     }
 
-    /**
-     * A helper class to show a clickable link with underlines turned off.
-     */
-    private class NoUnderlineClickableSpan extends ClickableSpan {
+    private class BluetoothClickableSpan extends NoUnderlineClickableSpan {
         // The type of link this span represents.
         private LinkType mLinkType;
 
         private Context mContext;
 
-        NoUnderlineClickableSpan(LinkType linkType, Context context) {
+        BluetoothClickableSpan(LinkType linkType, Context context) {
             mLinkType = linkType;
             mContext = context;
         }
 
         @Override
         public void onClick(View view) {
             if (mNativeBluetoothChooserDialogPtr == 0) {
                 return;
             }
 
@@ skipping 34 matching lines @@
                     nativeRestartSearch(mNativeBluetoothChooserDialogPtr);
                     break;
                 }
                 default:
                     assert false;
             }
 
             // Get rid of the highlight background on selection.
             view.invalidate();
         }
-
-        @Override
-        public void updateDrawState(TextPaint textPaint) {
-            super.updateDrawState(textPaint);
-            textPaint.bgColor = Color.TRANSPARENT;
-            textPaint.setUnderlineText(false);
-        }
     }
 
     @CalledByNative
     private static BluetoothChooserDialog create(WindowAndroid windowAndroid, String origin,
             int securityLevel, long nativeBluetoothChooserDialogPtr) {
         if (!windowAndroid.hasPermission(Manifest.permission.ACCESS_COARSE_LOCATION)
                 && !windowAndroid.hasPermission(Manifest.permission.ACCESS_FINE_LOCATION)
                 && !windowAndroid.canRequestPermission(
                            Manifest.permission.ACCESS_COARSE_LOCATION)) {
             // If we can't even ask for enough permission to scan for Bluetooth devices, don't open
             // the dialog.
             return null;
         }
         BluetoothChooserDialog dialog = new BluetoothChooserDialog(
                 windowAndroid, origin, securityLevel, nativeBluetoothChooserDialogPtr);
         dialog.show();
         return dialog;
     }
 
     @VisibleForTesting
     @CalledByNative
     void addDevice(String deviceId, String deviceName) {
-        List<ItemChooserDialog.ItemChooserRow> devices =
-                new ArrayList<ItemChooserDialog.ItemChooserRow>();
-        devices.add(new ItemChooserDialog.ItemChooserRow(deviceId, deviceName));
-        mItemChooserDialog.addItemsToList(devices);
+        mItemChooserDialog.addItemToList(
+                new ItemChooserDialog.ItemChooserRow(deviceId, deviceName));
     }
 
     @VisibleForTesting
     @CalledByNative
     void closeDialog() {
         mNativeBluetoothChooserDialogPtr = 0;
         mItemChooserDialog.dismiss();
     }
 
     @VisibleForTesting
     @CalledByNative
     void removeDevice(String deviceId) {
         mItemChooserDialog.setEnabled(deviceId, false);
     }
 
     @VisibleForTesting
     @CalledByNative
     void notifyAdapterTurnedOff() {
         SpannableString adapterOffMessage = SpanApplier.applySpans(
                 mContext.getString(R.string.bluetooth_adapter_off),
                 new SpanInfo("<link>", "</link>",
-                        new NoUnderlineClickableSpan(LinkType.ADAPTER_OFF, mContext)));
+                        new BluetoothClickableSpan(LinkType.ADAPTER_OFF, mContext)));
         SpannableString adapterOffStatus = SpanApplier.applySpans(
                 mContext.getString(R.string.bluetooth_adapter_off_help),
                 new SpanInfo("<link>", "</link>",
-                        new NoUnderlineClickableSpan(LinkType.ADAPTER_OFF_HELP, mContext)));
+                        new BluetoothClickableSpan(LinkType.ADAPTER_OFF_HELP, mContext)));
 
         mItemChooserDialog.setErrorState(adapterOffMessage, adapterOffStatus);
     }
 
     @CalledByNative
     private void notifyAdapterTurnedOn() {
         mItemChooserDialog.clear();
         if (mNativeBluetoothChooserDialogPtr != 0) {
             nativeRestartSearch(mNativeBluetoothChooserDialogPtr);
         }
@@ skipping 26 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);
 }