Merge "Handle DEVICE_TYPE_STYLUS in advanced details header." into udc-dev (8ba47734) · Commits · e / os / android_packages_apps_Settings

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -192,7 +192,8 @@ public class AdvancedBluetoothDetailsHeaderController extends BasePreferenceCont
		final String deviceType = BluetoothUtils.getStringMetaData(device,
		BluetoothDevice.METADATA_DEVICE_TYPE);
		if (TextUtils.equals(deviceType, BluetoothDevice.DEVICE_TYPE_WATCH)
		\|\| TextUtils.equals(deviceType, BluetoothDevice.DEVICE_TYPE_DEFAULT)) {
		\|\| TextUtils.equals(deviceType, BluetoothDevice.DEVICE_TYPE_DEFAULT)
		\|\| TextUtils.equals(deviceType, BluetoothDevice.DEVICE_TYPE_STYLUS)) {
		mLayoutPreference.findViewById(R.id.layout_left).setVisibility(View.GONE);
		mLayoutPreference.findViewById(R.id.layout_right).setVisibility(View.GONE);

+20 −0

Original line number	Diff line number	Diff line
		@@ -162,6 +162,26 @@ public class AdvancedBluetoothDetailsHeaderControllerTest {
		.requireViewById(R.id.bt_battery_summary).getVisibility()).isEqualTo(View.GONE);
		}

		@Test
		public void refresh_connectedStylus_behaveAsExpected() {
		when(mBluetoothDevice.getMetadata(
		BluetoothDevice.METADATA_DEVICE_TYPE)).thenReturn(
		BluetoothDevice.DEVICE_TYPE_STYLUS.getBytes());
		when(mBluetoothDevice.getMetadata(
		BluetoothDevice.METADATA_IS_UNTETHERED_HEADSET)).thenReturn(
		String.valueOf(false).getBytes());
		when(mCachedDevice.isConnected()).thenReturn(true);

		mController.refresh();

		assertThat(mLayoutPreference.findViewById(R.id.layout_left).getVisibility()).isEqualTo(
		View.GONE);
		assertThat(mLayoutPreference.findViewById(R.id.layout_right).getVisibility()).isEqualTo(
		View.GONE);
		assertThat(mLayoutPreference.findViewById(R.id.layout_middle).getVisibility()).isEqualTo(
		View.VISIBLE);
		}

		@Test
		public void refresh_connectedUntetheredHeadset_behaveAsExpected() {
		when(mBluetoothDevice.getMetadata(