diff options
author | calderwoodra <calderwoodra@google.com> | 2018-04-23 19:17:58 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-04-23 19:18:41 -0700 |
commit | fa999aa84fcea512ec27b3fd2f97c1cee1379cec (patch) | |
tree | b00081f2807ce64e5a631a158e0469416c31bb71 /java/com/android/dialer/speeddial | |
parent | 88cdcf9f24c29162144b3f9e02f1e44a706c87c1 (diff) |
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
Diffstat (limited to 'java/com/android/dialer/speeddial')
3 files changed, 21 insertions, 18 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(); diff --git a/java/com/android/dialer/speeddial/loader/SpeedDialUiItemLoader.java b/java/com/android/dialer/speeddial/loader/SpeedDialUiItemLoader.java index 71540da51..7107706fe 100644 --- a/java/com/android/dialer/speeddial/loader/SpeedDialUiItemLoader.java +++ b/java/com/android/dialer/speeddial/loader/SpeedDialUiItemLoader.java @@ -445,7 +445,10 @@ public final class SpeedDialUiItemLoader { } else if (item.defaultChannel() == null) { // If the contact is starred and doesn't have a default channel, insert duo channels newSpeedDialItemList.add(insertDuoChannelsToStarredContact(context, item)); - } // if starred and has a default channel, leave it as is, the user knows what they want. + } else { + // if starred and has a default channel, leave it as is, the user knows what they want. + newSpeedDialItemList.add(item); + } } return newSpeedDialItemList.build(); } diff --git a/java/com/android/dialer/speeddial/res/layout/disambig_dialog_layout.xml b/java/com/android/dialer/speeddial/res/layout/disambig_dialog_layout.xml index ba7b8052e..0272176ab 100644 --- a/java/com/android/dialer/speeddial/res/layout/disambig_dialog_layout.xml +++ b/java/com/android/dialer/speeddial/res/layout/disambig_dialog_layout.xml @@ -16,6 +16,7 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content"> @@ -35,17 +36,18 @@ android:fontFamily="sans-serif-medium" android:background="@android:color/white"/> - <ScrollView + <com.android.dialer.widget.MaxHeightScrollView android:id="@+id/disambig_scrollview" android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + app:maxHeight="240dp"> <LinearLayout android:id="@+id/communication_avenue_container" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content"/> - </ScrollView> + </com.android.dialer.widget.MaxHeightScrollView> <FrameLayout android:id="@+id/remember_this_choice_container" @@ -60,8 +62,7 @@ <CheckBox android:id="@+id/remember_this_choice_checkbox" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="48dp" + android:layout_height="48dp" android:text="@string/speed_dial_remember_this_choice"/> </FrameLayout> </LinearLayout>
\ No newline at end of file |