From 6ebde20b03db4c0d57f67acaac11832b610b966b Mon Sep 17 00:00:00 2001
From: Nick Chalko <nchalko@google.com>
Date: Tue, 3 Oct 2017 10:16:37 -0700
Subject: Sync to match Live Channels 1.15(ncis)

aka ub-tv-dev at a73a150bb7d0d1ce867ef980c6ac8411899d40ad

Bug: 64021596
Change-Id: I7c544fd15e2c58784f8babc31877ad0dfeebb4c0
(cherry picked from commit 633eb826b8c97731dfc5ef12c7bf78a63734275d)
---
 src/com/android/tv/menu/ItemListRowView.java | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

(limited to 'src/com/android/tv/menu/ItemListRowView.java')

diff --git a/src/com/android/tv/menu/ItemListRowView.java b/src/com/android/tv/menu/ItemListRowView.java
index 4919c595..cbeee936 100644
--- a/src/com/android/tv/menu/ItemListRowView.java
+++ b/src/com/android/tv/menu/ItemListRowView.java
@@ -28,6 +28,7 @@ import android.view.ViewGroup;
 
 import com.android.tv.MainActivity;
 import com.android.tv.R;
+import com.android.tv.util.ViewCache;
 
 import java.util.Collections;
 import java.util.List;
@@ -69,6 +70,8 @@ public class ItemListRowView extends MenuRowView implements OnChildSelectedListe
     protected void onFinishInflate() {
         super.onFinishInflate();
         mListView = (HorizontalGridView) getContentsView();
+        // Disable the position change animation of the cards.
+        mListView.setItemAnimator(null);
     }
 
     @Override
@@ -194,9 +197,24 @@ public class ItemListRowView extends MenuRowView implements OnChildSelectedListe
             return mItemList.size();
         }
 
+        /**
+         * Returns the position of the item.
+         */
+        protected int getItemPosition(T item) {
+            return mItemList.indexOf(item);
+        }
+
+        /**
+         * Returns {@code true} if the item list contains the item, otherwise {@code false}.
+         */
+        protected boolean containsItem(T item) {
+            return mItemList.contains(item);
+        }
+
         @Override
         public MyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-            View view = mLayoutInflater.inflate(getLayoutResId(viewType), parent, false);
+            View view = ViewCache.getInstance().getOrCreateView(
+                    mLayoutInflater, getLayoutResId(viewType), parent);
             return new MyViewHolder(view);
         }
 
-- 
cgit v1.2.3