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

Commit ef61c278 authored by Lei Yu's avatar Lei Yu Committed by Android (Google) Code Review
Browse files

Merge "Add summary placeholder for bt preference"

parents 3d63d25b 6c94769e

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

+1 −0
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ public abstract class BluetoothDeviceUpdater implements BluetoothCallback { 
                    new BluetoothDevicePreference(mPrefContext, cachedDevice,

                            mShowDeviceWithoutNames);

            btPreference.setOnGearClickListener(mDeviceProfilesListener);

            btPreference.setSummary(R.string.summary_placeholder);

            mPreferenceMap.put(device, btPreference);

            mDevicePreferenceCallback.onDeviceAdded(btPreference);

        }

tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java

+5 −2
Original line number Diff line number Diff line
@@ -93,8 +93,11 @@ public class BluetoothDeviceUpdaterTest { 
    public void testAddPreference_deviceNotExist_addPreference() {

        mBluetoothDeviceUpdater.addPreference(mCachedBluetoothDevice);



        verify(mDevicePreferenceCallback).onDeviceAdded(any(Preference.class));

        assertThat(mBluetoothDeviceUpdater.mPreferenceMap.containsKey(mBluetoothDevice)).isTrue();

        final Preference preference = mBluetoothDeviceUpdater.mPreferenceMap.get(mBluetoothDevice);

        assertThat(preference).isNotNull();

        assertThat(preference.getSummary()).isEqualTo(

                mContext.getString(R.string.summary_placeholder));

        verify(mDevicePreferenceCallback).onDeviceAdded(preference);

    }



    @Test