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

Bluetooth: Use string in remote device summary

Browse Source 
* Use String in connected device summary instead of resource id
* This allows dynamic strings to be built by CachedBluetoothDevice
  such as ones involve battery level percentages

Bug: 35874078
Test: make, unit test, test with Bluetooth devices
Change-Id: I583eac73280ca17387b215a4e7095e27de399998
This commit is contained in:
Jack He
2017-06-28 12:08:55 -07:00
parent 43d4fefb36
commit 04f5967c95
5 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java
View File

@@ -76,7 +76,7 @@ public class BluetoothDetailsControllerTestBase {
private String address;
private int majorDeviceClass;
private boolean connected;
private int connectionSummary;
private String connectionSummary;
public DeviceConfig setName(String newValue) {
this.name = newValue;
@@ -97,8 +97,8 @@ public class BluetoothDetailsControllerTestBase {
this.connected = newValue;
return this;
}
public DeviceConfig setConnectionSummary(int newValue) {
this.connectionSummary = newValue;
public DeviceConfig setConnectionSummary(String connectionSummary) {
this.connectionSummary = connectionSummary;
return this;
}
@@ -118,18 +118,18 @@ public class BluetoothDetailsControllerTestBase {
return connected;
}
public int getConnectionSummary() {
public String getConnectionSummary() {
return connectionSummary;
}
}
protected static DeviceConfig makeDefaultDeviceConfig() {
protected DeviceConfig makeDefaultDeviceConfig() {
return new DeviceConfig()
.setName("Mock Device")
.setAddress("B4:B0:34:B5:3B:1B")
.setMajorDeviceClass(BluetoothClass.Device.Major.AUDIO_VIDEO)
.setConnected(true)
.setConnectionSummary(R.string.bluetooth_connected);
.setConnectionSummary(mContext.getString(R.string.bluetooth_connected));
}
/**