Merge "Connect button should have correct icon"

This commit is contained in:
TreeHugger Robot
2018-11-29 18:01:53 +00:00
committed by Android (Google) Code Review

View File

@@ -76,7 +76,7 @@ public class BluetoothDetailsButtonsController extends BluetoothDetailsControlle
if (!mConnectButtonInitialized || previouslyConnected) { if (!mConnectButtonInitialized || previouslyConnected) {
mActionButtons mActionButtons
.setButton2Text(R.string.bluetooth_device_context_connect) .setButton2Text(R.string.bluetooth_device_context_connect)
// TODO (b/119646923) Icon is not ready. .setButton2Icon(R.drawable.ic_add_24dp)
.setButton2OnClickListener( .setButton2OnClickListener(
view -> mCachedDevice.connect(true /* connectAllProfiles */)); view -> mCachedDevice.connect(true /* connectAllProfiles */));
mConnectButtonInitialized = true; mConnectButtonInitialized = true;