PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update api name"

Browse Source 
am: f82f807e03

Change-Id: I20240365a45eb27bcfed019ac77e4e6bfe09d24d
This commit is contained in:
hughchen
2020-01-19 20:25:49 -08:00
committed by android-build-merger
parent 38b21bca73 f82f807e03
commit c36a071238
5 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java
View File

@@ -79,7 +79,7 @@ public class BluetoothDetailsButtonsController extends BluetoothDetailsControlle
.setButton2Text(R.string.bluetooth_device_context_connect) .setButton2Text(R.string.bluetooth_device_context_connect)
.setButton2Icon(R.drawable.ic_add_24dp) .setButton2Icon(R.drawable.ic_add_24dp)
.setButton2OnClickListener( .setButton2OnClickListener(
view -> mCachedDevice.connect(true /* connectAllProfiles */)); view -> mCachedDevice.connect());
mConnectButtonInitialized = true; mConnectButtonInitialized = true;
} }
} }

2
src/com/android/settings/bluetooth/BluetoothDevicePreference.java
View File

@@ -218,7 +218,7 @@ public final class BluetoothDevicePreference extends GearPreference implements
} else if (bondState == BluetoothDevice.BOND_BONDED) { } else if (bondState == BluetoothDevice.BOND_BONDED) {
metricsFeatureProvider.action(context, metricsFeatureProvider.action(context,
SettingsEnums.ACTION_SETTINGS_BLUETOOTH_CONNECT); SettingsEnums.ACTION_SETTINGS_BLUETOOTH_CONNECT);
mCachedDevice.connect(true); mCachedDevice.connect();
} else if (bondState == BluetoothDevice.BOND_NONE) { } else if (bondState == BluetoothDevice.BOND_NONE) {
metricsFeatureProvider.action(context, metricsFeatureProvider.action(context,
SettingsEnums.ACTION_SETTINGS_BLUETOOTH_PAIR); SettingsEnums.ACTION_SETTINGS_BLUETOOTH_PAIR);

2
src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java
View File

@@ -53,7 +53,7 @@ public class SavedBluetoothDeviceUpdater extends BluetoothDeviceUpdater
public boolean onPreferenceClick(Preference preference) { public boolean onPreferenceClick(Preference preference) {
final CachedBluetoothDevice device = ((BluetoothDevicePreference) preference) final CachedBluetoothDevice device = ((BluetoothDevicePreference) preference)
.getBluetoothDevice(); .getBluetoothDevice();
device.connect(true); device.connect();
return true; return true;
} }
} }

5
tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java
View File

@@ -22,7 +22,6 @@ import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@@ -103,7 +102,7 @@ public class BluetoothDetailsButtonsControllerTest extends BluetoothDetailsContr
verify(mButtonsPref).setButton2Text(R.string.bluetooth_device_context_connect); verify(mButtonsPref).setButton2Text(R.string.bluetooth_device_context_connect);
mConnectButton.callOnClick(); mConnectButton.callOnClick();
verify(mCachedDevice).connect(eq(true)); verify(mCachedDevice).connect();
} }
@Test @Test
@@ -119,7 +118,7 @@ public class BluetoothDetailsButtonsControllerTest extends BluetoothDetailsContr
// Click the button and make sure that connect (not disconnect) gets called. // Click the button and make sure that connect (not disconnect) gets called.
mConnectButton.callOnClick(); mConnectButton.callOnClick();
verify(mCachedDevice).connect(eq(true)); verify(mCachedDevice).connect();
} }
@Test @Test

2
tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java
View File

@@ -121,6 +121,6 @@ public class SavedBluetoothDeviceUpdaterTest {
public void onClick_Preference_setConnect() { public void onClick_Preference_setConnect() {
mBluetoothDeviceUpdater.onPreferenceClick(mPreference); mBluetoothDeviceUpdater.onPreferenceClick(mPreference);
verify(mCachedBluetoothDevice).connect(true); verify(mCachedBluetoothDevice).connect();
} }
} }