SpeedDialEntries with default numbers now properly show up.

This change includes:
 - fixing an issue where default numbers were being removed when inserting duo
 channels.
 - setting a max height on the disambig dialog scrollview because it was
 causing accessibility issues (and will be needed later).

Test: SpeedDialIntegrationTest, SpeedDialUiItemLoaderTest
PiperOrigin-RevId: 194023169
Change-Id: I4896fb5dbbb99aefd9713c6768ea9c07ca906d6d

1 files changed, 11 insertions, 12 deletions

diff --git a/java/com/android/dialer/speeddial/SpeedDialFragment.java b/java/com/android/dialer/speeddial/SpeedDialFragment.java
index 3654c816b..26893a8d3 100644
--- a/java/com/android/dialer/speeddial/SpeedDialFragment.java
+++ b/java/com/android/dialer/speeddial/SpeedDialFragment.java
@@ -148,13 +148,7 @@ public class SpeedDialFragment extends Fragment {
     speedDialLoaderListener.listen(
         getContext(),
         UiItemLoaderComponent.get(getContext()).speedDialUiItemLoader().loadSpeedDialUiItems(),
-        speedDialUiItems -> {
-          adapter.setSpeedDialUiItems(
-              UiItemLoaderComponent.get(getContext())
-                  .speedDialUiItemLoader()
-                  .insertDuoChannels(getContext(), speedDialUiItems));
-          adapter.notifyDataSetChanged();
-        },
+        this::onSpeedDialUiItemListLoaded,
         throwable -> {
           throw new RuntimeException(throwable);
         });
@@ -170,11 +164,7 @@ public class SpeedDialFragment extends Fragment {
             UiItemLoaderComponent.get(getContext())
                 .speedDialUiItemLoader()
                 .starContact(data.getData()),
-            speedDialUiItems -> {
-              adapter.setSpeedDialUiItems(speedDialUiItems);
-              // TODO(calderwoodra): Use DiffUtil to properly update and animate the change
-              adapter.notifyDataSetChanged();
-            },
+            this::onSpeedDialUiItemListLoaded,
             throwable -> {
               throw new RuntimeException(throwable);
             });
@@ -182,6 +172,15 @@ public class SpeedDialFragment extends Fragment {
     }
   }
 
+  private void onSpeedDialUiItemListLoaded(ImmutableList<SpeedDialUiItem> speedDialUiItems) {
+    // TODO(calderwoodra): Use DiffUtil to properly update and animate the change
+    adapter.setSpeedDialUiItems(
+        UiItemLoaderComponent.get(getContext())
+            .speedDialUiItemLoader()
+            .insertDuoChannels(getContext(), speedDialUiItems));
+    adapter.notifyDataSetChanged();
+  }
+
   @Override
   public void onPause() {
     super.onPause();