commit 32ddc8338f65c4caf2e6848ee80431211e758d9d
author Jay Shrauner <shrauner@google.com> Mon Mar 03 23:07:04 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 03 23:07:05 2014 +0000
tree e1349bdae24a3fbe6cf87e140d5495e35e2d56fa
parent 243ab2f22eb25fd35a936e8a62808cad935bb510
parent f8780c9a45b76bc6fe749a5a7d0063f4c1003cee

Merge "Protect against class cast exception" into klp-dev

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 04611b4..81d9bfd 100644
--- a/src/com/android/dialer/list/PhoneFavoriteFragment.java
+++ b/src/com/android/dialer/list/PhoneFavoriteFragment.java
@@ -541,7 +541,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);