LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Remove calls to LM.getItemCount in demos."

Browse Source
This commit is contained in:
Yigit Boyar
2014-06-12 23:05:41 +00:00
committed by Android (Google) Code Review
parent 37cac69057 c77710e3eb
commit 3d49877e6e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/Support7Demos/src/com/example/android/supportv7/widget/AnimatedRecyclerView.java
View File

@@ -286,7 +286,7 @@ public class AnimatedRecyclerView extends Activity {
final int scrollBy = -Math.min(dy - scrolled, hangingBottom); final int scrollBy = -Math.min(dy - scrolled, hangingBottom);
scrolled -= scrollBy; scrolled -= scrollBy;
offsetChildrenVertical(scrollBy); offsetChildrenVertical(scrollBy);
if (scrolled < dy && getItemCount() > mFirstPosition + getChildCount()) { if (scrolled < dy && state.getItemCount() > mFirstPosition + getChildCount()) {
View v = recycler.getViewForPosition(mFirstPosition + getChildCount()); View v = recycler.getViewForPosition(mFirstPosition + getChildCount());
final int top = getChildAt(getChildCount() - 1).getBottom(); final int top = getChildAt(getChildCount() - 1).getBottom();
addView(v); addView(v);
@@ -332,7 +332,7 @@ public class AnimatedRecyclerView extends Activity {
} }
} }
if (direction == View.FOCUS_DOWN || direction == View.FOCUS_FORWARD) { if (direction == View.FOCUS_DOWN || direction == View.FOCUS_FORWARD) {
while (mFirstPosition + getChildCount() < getItemCount() && while (mFirstPosition + getChildCount() < state.getItemCount() &&
newViewsHeight < mScrollDistance) { newViewsHeight < mScrollDistance) {
View v = recycler.getViewForPosition(mFirstPosition + getChildCount()); View v = recycler.getViewForPosition(mFirstPosition + getChildCount());
final int top = getChildAt(getChildCount() - 1).getBottom(); final int top = getChildAt(getChildCount() - 1).getBottom();

4
samples/Support7Demos/src/com/example/android/supportv7/widget/RecyclerViewActivity.java
View File

@@ -176,7 +176,7 @@ public class RecyclerViewActivity extends Activity {
final int scrollBy = -Math.min(dy - scrolled, hangingBottom); final int scrollBy = -Math.min(dy - scrolled, hangingBottom);
scrolled -= scrollBy; scrolled -= scrollBy;
offsetChildrenVertical(scrollBy); offsetChildrenVertical(scrollBy);
if (scrolled < dy && getItemCount() > mFirstPosition + getChildCount()) { if (scrolled < dy && state.getItemCount() > mFirstPosition + getChildCount()) {
View v = recycler.getViewForPosition(mFirstPosition + getChildCount()); View v = recycler.getViewForPosition(mFirstPosition + getChildCount());
final int top = getDecoratedBottom(getChildAt(getChildCount() - 1)); final int top = getDecoratedBottom(getChildAt(getChildCount() - 1));
addView(v); addView(v);
@@ -222,7 +222,7 @@ public class RecyclerViewActivity extends Activity {
} }
} }
if (direction == View.FOCUS_DOWN || direction == View.FOCUS_FORWARD) { if (direction == View.FOCUS_DOWN || direction == View.FOCUS_FORWARD) {
while (mFirstPosition + getChildCount() < getItemCount() && while (mFirstPosition + getChildCount() < state.getItemCount() &&
newViewsHeight < mScrollDistance) { newViewsHeight < mScrollDistance) {
View v = recycler.getViewForPosition(mFirstPosition + getChildCount()); View v = recycler.getViewForPosition(mFirstPosition + getChildCount());
final int top = getDecoratedBottom(getChildAt(getChildCount() - 1)); final int top = getDecoratedBottom(getChildAt(getChildCount() - 1));