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

Merge "Fix Connect State message in Device details for Hearing Aids" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-10-02 20:30:17 +00:00
committed by Android (Google) Code Review
parent f9658e13bb 69e1bb1cf3
commit 31703ca227
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java
View File

@@ -20,6 +20,7 @@ import android.content.Context;
import android.graphics.drawable.Drawable;
import android.support.v14.preference.PreferenceFragment;
import android.support.v7.preference.PreferenceScreen;
import android.util.Log;
import android.util.Pair;
import com.android.internal.annotations.VisibleForTesting;
@@ -36,6 +37,7 @@ import com.android.settingslib.bluetooth.LocalBluetoothManager;
*/
public class BluetoothDetailsHeaderController extends BluetoothDetailsController {
private static final String KEY_DEVICE_HEADER = "bluetooth_device_header";
private static final String TAG = "BluetoothDetailsHeaderController";
private EntityHeaderController mHeaderController;
private LocalBluetoothManager mLocalManager;
@@ -63,12 +65,16 @@ public class BluetoothDetailsHeaderController extends BluetoothDetailsController
.getBtClassDrawableWithDescription(mContext, mCachedDevice,
mContext.getResources().getFraction(R.fraction.bt_battery_scale_fraction, 1, 1));
String summaryText = mCachedDevice.getConnectionSummary();
// If both the hearing aids are connected, two battery status should be shown.
if (mCachedDevice.isHearingAidDevice()) {
// For Hearing Aid device, display the other battery status.
final String pairDeviceSummary = mDeviceManager
.getHearingAidPairDeviceSummary(mCachedDevice);
if (pairDeviceSummary != null) {
Log.d(TAG, "setHeaderProperties: HearingAid: summaryText=" + summaryText
+ ", pairDeviceSummary=" + pairDeviceSummary);
mHeaderController.setSecondSummary(pairDeviceSummary);
}
mHeaderController.setLabel(mCachedDevice.getName());
mHeaderController.setIcon(pair.first);
mHeaderController.setIconContentDescription(pair.second);

11
tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java
View File

@@ -19,6 +19,7 @@ package com.android.settings.bluetooth;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -96,7 +97,7 @@ public class BluetoothDetailsHeaderControllerTest extends BluetoothDetailsContro
verify(mHeaderController).setIcon(any(Drawable.class));
verify(mHeaderController).setIconContentDescription(any(String.class));
verify(mHeaderController).setSummary(any(String.class));
verify(mHeaderController).setSecondSummary(any(String.class));
verify(mHeaderController, never()).setSecondSummary(any(String.class));
verify(mHeaderController).done(mActivity, true);
}
@@ -119,4 +120,12 @@ public class BluetoothDetailsHeaderControllerTest extends BluetoothDetailsContro
inOrder.verify(mHeaderController)
.setSummary(mContext.getString(R.string.bluetooth_connecting));
}
@Test
public void testSecondSummary_isHearingAidDevice_showSecondSummary() {
when(mCachedDevice.isHearingAidDevice()).thenReturn(true);
showScreen(mController);
verify(mHeaderController).setSecondSummary(any(String.class));
}
}