commit 662b209b15151f3f79e9d25d55282c55fc210ba6
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Nov 29 18:01:53 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 29 18:01:53 2018 +0000
tree d3997f3d0b1cd4788d55ab5fce2567e6aa965991
parent 91ff3491dbda62581a95a15e3cae17fa21f86564
parent fe03fa546a53cd62cd8c0afc3853a8b0bc9c4a3d

Merge "Connect button should have correct icon"

src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java

diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java b/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java
index 563a06a..4bb2103 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java
@@ -76,7 +76,7 @@
             if (!mConnectButtonInitialized || previouslyConnected) {
                 mActionButtons
                         .setButton2Text(R.string.bluetooth_device_context_connect)
-                        // TODO (b/119646923) Icon is not ready.
+                        .setButton2Icon(R.drawable.ic_add_24dp)
                         .setButton2OnClickListener(
                                 view -> mCachedDevice.connect(true /* connectAllProfiles */));
                 mConnectButtonInitialized = true;