From c77710e3eb0edef1b376364aac4042f67d5d1c3e Mon Sep 17 00:00:00 2001 From: Yigit Boyar Date: Thu, 12 Jun 2014 15:58:16 -0700 Subject: [PATCH] Remove calls to LM.getItemCount in demos. Bug: 15410611 Change-Id: Ie31616f792501f29fbb9e68f742563fbb1cde0ca --- .../android/supportv7/widget/AnimatedRecyclerView.java | 4 ++-- .../android/supportv7/widget/RecyclerViewActivity.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/samples/Support7Demos/src/com/example/android/supportv7/widget/AnimatedRecyclerView.java b/samples/Support7Demos/src/com/example/android/supportv7/widget/AnimatedRecyclerView.java index 6d8f7203c..f4165ac2d 100644 --- a/samples/Support7Demos/src/com/example/android/supportv7/widget/AnimatedRecyclerView.java +++ b/samples/Support7Demos/src/com/example/android/supportv7/widget/AnimatedRecyclerView.java @@ -286,7 +286,7 @@ public class AnimatedRecyclerView extends Activity { final int scrollBy = -Math.min(dy - scrolled, hangingBottom); scrolled -= scrollBy; offsetChildrenVertical(scrollBy); - if (scrolled < dy && getItemCount() > mFirstPosition + getChildCount()) { + if (scrolled < dy && state.getItemCount() > mFirstPosition + getChildCount()) { View v = recycler.getViewForPosition(mFirstPosition + getChildCount()); final int top = getChildAt(getChildCount() - 1).getBottom(); addView(v); @@ -332,7 +332,7 @@ public class AnimatedRecyclerView extends Activity { } } if (direction == View.FOCUS_DOWN || direction == View.FOCUS_FORWARD) { - while (mFirstPosition + getChildCount() < getItemCount() && + while (mFirstPosition + getChildCount() < state.getItemCount() && newViewsHeight < mScrollDistance) { View v = recycler.getViewForPosition(mFirstPosition + getChildCount()); final int top = getChildAt(getChildCount() - 1).getBottom(); diff --git a/samples/Support7Demos/src/com/example/android/supportv7/widget/RecyclerViewActivity.java b/samples/Support7Demos/src/com/example/android/supportv7/widget/RecyclerViewActivity.java index baecf86a3..747992b19 100644 --- a/samples/Support7Demos/src/com/example/android/supportv7/widget/RecyclerViewActivity.java +++ b/samples/Support7Demos/src/com/example/android/supportv7/widget/RecyclerViewActivity.java @@ -176,7 +176,7 @@ public class RecyclerViewActivity extends Activity { final int scrollBy = -Math.min(dy - scrolled, hangingBottom); scrolled -= scrollBy; offsetChildrenVertical(scrollBy); - if (scrolled < dy && getItemCount() > mFirstPosition + getChildCount()) { + if (scrolled < dy && state.getItemCount() > mFirstPosition + getChildCount()) { View v = recycler.getViewForPosition(mFirstPosition + getChildCount()); final int top = getDecoratedBottom(getChildAt(getChildCount() - 1)); addView(v); @@ -222,7 +222,7 @@ public class RecyclerViewActivity extends Activity { } } if (direction == View.FOCUS_DOWN || direction == View.FOCUS_FORWARD) { - while (mFirstPosition + getChildCount() < getItemCount() && + while (mFirstPosition + getChildCount() < state.getItemCount() && newViewsHeight < mScrollDistance) { View v = recycler.getViewForPosition(mFirstPosition + getChildCount()); final int top = getDecoratedBottom(getChildAt(getChildCount() - 1));