From fa999aa84fcea512ec27b3fd2f97c1cee1379cec Mon Sep 17 00:00:00 2001 From: calderwoodra Date: Mon, 23 Apr 2018 19:17:58 -0700 Subject: 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 --- .../dialer/speeddial/SpeedDialFragment.java | 23 ++++---- .../speeddial/loader/SpeedDialUiItemLoader.java | 5 +- .../res/layout/disambig_dialog_layout.xml | 11 ++-- .../android/dialer/widget/MaxHeightScrollView.java | 64 ++++++++++++++++++++++ .../com/android/dialer/widget/res/values/attrs.xml | 3 + 5 files changed, 88 insertions(+), 18 deletions(-) create mode 100644 java/com/android/dialer/widget/MaxHeightScrollView.java 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 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 @@ --> @@ -35,17 +36,18 @@ android:fontFamily="sans-serif-medium" android:background="@android:color/white"/> - + android:layout_height="wrap_content" + app:maxHeight="240dp"> - + \ No newline at end of file diff --git a/java/com/android/dialer/widget/MaxHeightScrollView.java b/java/com/android/dialer/widget/MaxHeightScrollView.java new file mode 100644 index 000000000..cec8f8f35 --- /dev/null +++ b/java/com/android/dialer/widget/MaxHeightScrollView.java @@ -0,0 +1,64 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.dialer.widget; + +import android.content.Context; +import android.content.res.TypedArray; +import android.support.annotation.Nullable; +import android.util.AttributeSet; +import android.widget.ScrollView; + +/** {@link ScrollView} with a max height attribute. */ +public class MaxHeightScrollView extends ScrollView { + + private final int maxHeight; + + public MaxHeightScrollView(Context context, @Nullable AttributeSet attrs) { + this(context, attrs, 0); + } + + public MaxHeightScrollView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { + this(context, attrs, defStyleAttr, 0); + } + + public MaxHeightScrollView( + Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { + super(context, attrs, defStyleAttr, defStyleRes); + if (isInEditMode()) { + maxHeight = -1; + return; + } + + TypedArray array = + context.getTheme().obtainStyledAttributes(attrs, R.styleable.MaxHeightScrollView, 0, 0); + try { + maxHeight = array.getDimensionPixelSize(R.styleable.MaxHeightScrollView_maxHeight, -1); + } finally { + array.recycle(); + } + } + + @Override + protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + if (maxHeight < 0) { + super.onMeasure(widthMeasureSpec, heightMeasureSpec); + } else { + super.onMeasure( + widthMeasureSpec, MeasureSpec.makeMeasureSpec(maxHeight, MeasureSpec.AT_MOST)); + } + } +} diff --git a/java/com/android/dialer/widget/res/values/attrs.xml b/java/com/android/dialer/widget/res/values/attrs.xml index bd5c3a4fb..ecf92bfc3 100644 --- a/java/com/android/dialer/widget/res/values/attrs.xml +++ b/java/com/android/dialer/widget/res/values/attrs.xml @@ -20,4 +20,7 @@ + + + -- cgit v1.2.3