Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f6c2712 authored by Vania Januar's avatar Vania Januar Committed by Android (Google) Code Review
Browse files

Merge "DEVICE_TYPE_STYLUS should support AdvancedDetailsHeader."

parents 7688ee6a face5ff4

packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothUtils.java

+2 −1
Original line number Diff line number Diff line
@@ -260,7 +260,8 @@ public class BluetoothUtils { 
                BluetoothDevice.METADATA_DEVICE_TYPE);

        if (TextUtils.equals(deviceType, BluetoothDevice.DEVICE_TYPE_UNTETHERED_HEADSET)

                || 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)) {

            Log.d(TAG, "isAdvancedDetailsHeader: deviceType is " + deviceType);

            return true;

        }

packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/BluetoothUtilsTest.java

+9 −0
Original line number Diff line number Diff line
@@ -192,6 +192,15 @@ public class BluetoothUtilsTest { 
        assertThat(BluetoothUtils.isAdvancedDetailsHeader(mBluetoothDevice)).isEqualTo(true);

    }



    @Test

    public void isAdvancedDetailsHeader_deviceTypeStylus_returnTrue() {

        when(mBluetoothDevice.getMetadata(

                BluetoothDevice.METADATA_DEVICE_TYPE)).thenReturn(

                BluetoothDevice.DEVICE_TYPE_STYLUS.getBytes());



        assertThat(BluetoothUtils.isAdvancedDetailsHeader(mBluetoothDevice)).isEqualTo(true);

    }



    @Test

    public void isAdvancedDetailsHeader_deviceTypeDefault_returnTrue() {

        when(mBluetoothDevice.getMetadata(