summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/speeddial
diff options
context:
space:
mode:
authoryueg <yueg@google.com>2018-06-28 14:26:45 -0700
committerCopybara-Service <copybara-piper@google.com>2018-06-28 16:25:46 -0700
commit5b99e36d5139a4e6b141af45f4cbcd946d81675e (patch)
treec883e3adc2497dcb8efeae8a7f5dc0524ba967e6 /java/com/android/dialer/speeddial
parent9af4b65fa7717a647e3c8996cbbbcc93637aeab4 (diff)
Fix scroll for new favorites
Test: SpeedDialAdapterTest PiperOrigin-RevId: 202543795 Change-Id: I1eec7a7328da3037b4d1cbacc7d9b211305e3eb0
Diffstat (limited to 'java/com/android/dialer/speeddial')
-rw-r--r--java/com/android/dialer/speeddial/SpeedDialAdapter.java8
-rw-r--r--java/com/android/dialer/speeddial/SpeedDialFragment.java9
-rw-r--r--java/com/android/dialer/speeddial/res/layout/fragment_speed_dial.xml4
3 files changed, 16 insertions, 5 deletions
diff --git a/java/com/android/dialer/speeddial/SpeedDialAdapter.java b/java/com/android/dialer/speeddial/SpeedDialAdapter.java
index ff52a0745..4a48b6504 100644
--- a/java/com/android/dialer/speeddial/SpeedDialAdapter.java
+++ b/java/com/android/dialer/speeddial/SpeedDialAdapter.java
@@ -34,6 +34,7 @@ import android.widget.FrameLayout;
import com.android.dialer.common.Assert;
import com.android.dialer.speeddial.FavoritesViewHolder.FavoriteContactsListener;
import com.android.dialer.speeddial.HeaderViewHolder.SpeedDialHeaderListener;
+import com.android.dialer.speeddial.SpeedDialFragment.HostInterface;
import com.android.dialer.speeddial.SuggestionViewHolder.SuggestedContactsListener;
import com.android.dialer.speeddial.draghelper.SpeedDialItemTouchHelperCallback.ItemTouchHelperAdapter;
import com.android.dialer.speeddial.loader.SpeedDialUiItem;
@@ -81,6 +82,7 @@ public final class SpeedDialAdapter extends RecyclerView.Adapter<RecyclerView.Vi
private final FavoriteContactsListener favoritesListener;
private final SuggestedContactsListener suggestedListener;
private final SpeedDialHeaderListener headerListener;
+ private final HostInterface hostInterface;
private final Map<Integer, Integer> positionToRowTypeMap = new ArrayMap<>();
private List<SpeedDialUiItem> speedDialUiItems;
@@ -95,11 +97,13 @@ public final class SpeedDialAdapter extends RecyclerView.Adapter<RecyclerView.Vi
Context context,
FavoriteContactsListener favoritesListener,
SuggestedContactsListener suggestedListener,
- SpeedDialHeaderListener headerListener) {
+ SpeedDialHeaderListener headerListener,
+ HostInterface hostInterface) {
this.context = context;
this.favoritesListener = favoritesListener;
this.suggestedListener = suggestedListener;
this.headerListener = headerListener;
+ this.hostInterface = hostInterface;
}
@Override
@@ -255,6 +259,7 @@ public final class SpeedDialAdapter extends RecyclerView.Adapter<RecyclerView.Vi
if (viewHolder != null) {
draggingFavoritesViewHolder = (FavoritesViewHolder) viewHolder;
draggingFavoritesViewHolder.onSelectedChanged(true);
+ hostInterface.dragFavorite(true);
removeViewHolder.show();
}
break;
@@ -263,6 +268,7 @@ public final class SpeedDialAdapter extends RecyclerView.Adapter<RecyclerView.Vi
if (draggingFavoritesViewHolder != null) {
draggingFavoritesViewHolder.onSelectedChanged(false);
draggingFavoritesViewHolder = null;
+ hostInterface.dragFavorite(false);
removeViewHolder.hide();
}
break;
diff --git a/java/com/android/dialer/speeddial/SpeedDialFragment.java b/java/com/android/dialer/speeddial/SpeedDialFragment.java
index a958d443a..d4e7a76fa 100644
--- a/java/com/android/dialer/speeddial/SpeedDialFragment.java
+++ b/java/com/android/dialer/speeddial/SpeedDialFragment.java
@@ -156,7 +156,12 @@ public class SpeedDialFragment extends Fragment {
new UpdateSpeedDialAdapterListener(),
speedDialLoaderListener);
adapter =
- new SpeedDialAdapter(getContext(), favoritesListener, suggestedListener, headerListener);
+ new SpeedDialAdapter(
+ getContext(),
+ favoritesListener,
+ suggestedListener,
+ headerListener,
+ FragmentUtils.getParentUnsafe(this, HostInterface.class));
layoutManager.setSpanSizeLookup(adapter.getSpanSizeLookup());
RecyclerView recyclerView = rootLayout.findViewById(R.id.speed_dial_recycler_view);
recyclerView.setLayoutManager(layoutManager);
@@ -653,5 +658,7 @@ public class SpeedDialFragment extends Fragment {
public interface HostInterface {
void setHasFrequents(boolean hasFrequents);
+
+ void dragFavorite(boolean start);
}
}
diff --git a/java/com/android/dialer/speeddial/res/layout/fragment_speed_dial.xml b/java/com/android/dialer/speeddial/res/layout/fragment_speed_dial.xml
index 472f9e951..e79bc6b2f 100644
--- a/java/com/android/dialer/speeddial/res/layout/fragment_speed_dial.xml
+++ b/java/com/android/dialer/speeddial/res/layout/fragment_speed_dial.xml
@@ -17,9 +17,7 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/speed_dial_root"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:clipChildren="false"
- android:clipToPadding="false">
+ android:layout_height="match_parent">
<android.support.v7.widget.RecyclerView
android:id="@+id/speed_dial_recycler_view"