commit 66ed26d14dab7693427df39628f3a5f5c300005f
author Jay Shrauner <shrauner@google.com> Fri Dec 20 19:30:13 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 20 19:30:13 2013 +0000
tree 4a9f5140fb7629c1487440b6858f00be679ae7f9
parent a03a22ec39b46a41749bd4177db245d809c191b1
parent f2429f2f4fb0629752e8d719ad855f97263d2216

Merge "Protect against class cast exception"

src/com/android/dialer/list/PhoneFavoriteFragment.java

diff --git a/src/com/android/dialer/list/PhoneFavoriteFragment.java b/src/com/android/dialer/list/PhoneFavoriteFragment.java
index 34666ee..9e38394 100644
--- a/src/com/android/dialer/list/PhoneFavoriteFragment.java
+++ b/src/com/android/dialer/list/PhoneFavoriteFragment.java
@@ -538,7 +538,8 @@
                     final View child = mListView.getChildAt(i);
                     int position = firstVisiblePosition + i;
                     final int itemViewType = mAdapter.getItemViewType(position);
-                    if (itemViewType == PhoneFavoritesTileAdapter.ViewTypes.TOP) {
+                    if (itemViewType == PhoneFavoritesTileAdapter.ViewTypes.TOP &&
+                            child instanceof ContactTileRow) {
                         // This is a tiled row, so perform horizontal animations instead
                         performHorizontalAnimations((ContactTileRow) child, (
                                 ArrayList<ContactEntry>) mAdapter.getItem(position), idsInPlace);