commit 0dad10bc999e8bc154e80be0f094e3a4021180b4
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Dec 23 00:47:11 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Dec 23 00:47:11 2017 +0000
tree bc20703b2870f043a9181cf09102c90a6d90b0c6
parent ef61c27865d22ad5b248b937b4bc4180e2d0385c
parent bf2ff340049fe7f1f0851047576401fe9a28b9fd

Merge "Import translations. DO NOT MERGE"

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

diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java
index 127730b..9898c33 100644
--- a/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java
@@ -176,6 +176,7 @@
                     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

diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java
index 62039d7..823bcbe 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 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