From 6c94769e56e3633b7e11d10e8de310c040ea818c Mon Sep 17 00:00:00 2001 From: jackqdyulei Date: Fri, 22 Dec 2017 10:25:04 -0800 Subject: [PATCH] Add summary placeholder for bt preference Then UI won't be janky(as everything slide down a little bit) Bug: 63910184 Test: RunSettingsRoboTests Change-Id: Ie4074694f54af92da52f09d2caaab5490fa73647 --- .../android/settings/bluetooth/BluetoothDeviceUpdater.java | 1 + .../settings/bluetooth/BluetoothDeviceUpdaterTest.java | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java index 127730ba39a..9898c33be3c 100644 --- a/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java +++ b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java @@ -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); } diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java index 62039d76dd3..823bcbe7edf 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java @@ -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