From 1d6673588c5bb9a54a7439ebae1bd38e34979797 Mon Sep 17 00:00:00 2001 From: Yigit Boyar Date: Tue, 27 May 2014 16:31:59 -0700 Subject: [PATCH] Remove deprecated RecyclerView methods Change-Id: If9b0aca85221d64dbbb5cda75f985a91de6c67d2 (cherry picked from commit 67bdb44d980e6f565f4ec3063a6041bbcbab397c) --- .../widget/AnimatedRecyclerView.java | 23 ++++++-------- .../widget/RecyclerViewActivity.java | 31 ++++++------------- 2 files changed, 20 insertions(+), 34 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 a6f346a7f..83cf4d3b0 100644 --- a/samples/Support7Demos/src/com/example/android/supportv7/widget/AnimatedRecyclerView.java +++ b/samples/Support7Demos/src/com/example/android/supportv7/widget/AnimatedRecyclerView.java @@ -92,8 +92,7 @@ public class AnimatedRecyclerView extends Activity { public void checkboxClicked(View view) { ViewGroup parent = (ViewGroup) view.getParent(); boolean selected = ((CheckBox) view).isChecked(); - int index = mRecyclerView.indexOfChild(parent); - MyViewHolder holder = (MyViewHolder) mRecyclerView.getViewHolderForChildAt(index); + MyViewHolder holder = (MyViewHolder) mRecyclerView.getChildViewHolder(parent); mAdapter.selectItem(holder, selected); } @@ -164,8 +163,7 @@ public class AnimatedRecyclerView extends Activity { } @Override - public void onLayoutChildren(RecyclerView.Adapter adapter, RecyclerView.Recycler recycler, - boolean structureChanged, RecyclerView.State state) { + public void onLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State state) { int parentBottom = getHeight() - getPaddingBottom(); final View oldTopView = getChildCount() > 0 ? getChildAt(0) : null; @@ -185,7 +183,7 @@ public class AnimatedRecyclerView extends Activity { int count = state.getItemCount(); for (int i = 0; mFirstPosition + i < count && top < parentBottom; i++, top = bottom) { - View v = recycler.getViewForPosition(adapter, mFirstPosition + i); + View v = recycler.getViewForPosition(mFirstPosition + i); RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) v.getLayoutParams(); if (!params.isItemRemoved()) { @@ -242,8 +240,8 @@ public class AnimatedRecyclerView extends Activity { } @Override - public int scrollVerticallyBy(int dy, RecyclerView.Adapter adapter, - RecyclerView.Recycler recycler) { + public int scrollVerticallyBy(int dy, RecyclerView.Recycler recycler, + RecyclerView.State state) { if (getChildCount() == 0) { return 0; } @@ -260,7 +258,7 @@ public class AnimatedRecyclerView extends Activity { offsetChildrenVertical(scrollBy); if (mFirstPosition > 0 && scrolled > dy) { mFirstPosition--; - View v = recycler.getViewForPosition(adapter, mFirstPosition); + View v = recycler.getViewForPosition(mFirstPosition); addView(v, 0); measureChild(v, 0, 0); final int bottom = topView.getTop(); // TODO decorated top? @@ -279,8 +277,7 @@ public class AnimatedRecyclerView extends Activity { scrolled -= scrollBy; offsetChildrenVertical(scrollBy); if (scrolled < dy && getItemCount() > mFirstPosition + getChildCount()) { - View v = recycler.getViewForPosition(adapter, - mFirstPosition + getChildCount()); + View v = recycler.getViewForPosition(mFirstPosition + getChildCount()); final int top = getChildAt(getChildCount() - 1).getBottom(); addView(v); measureChild(v, 0, 0); @@ -297,7 +294,7 @@ public class AnimatedRecyclerView extends Activity { @Override public View onFocusSearchFailed(View focused, int direction, - RecyclerView.Adapter adapter, RecyclerView.Recycler recycler) { + RecyclerView.Recycler recycler, RecyclerView.State state) { final int oldCount = getChildCount(); if (oldCount == 0) { @@ -312,7 +309,7 @@ public class AnimatedRecyclerView extends Activity { if (direction == View.FOCUS_UP || direction == View.FOCUS_BACKWARD) { while (mFirstPosition > 0 && newViewsHeight < mScrollDistance) { mFirstPosition--; - View v = recycler.getViewForPosition(adapter, mFirstPosition); + View v = recycler.getViewForPosition(mFirstPosition); final int bottom = getChildAt(0).getTop(); // TODO decorated top? addView(v, 0); measureChild(v, 0, 0); @@ -327,7 +324,7 @@ public class AnimatedRecyclerView extends Activity { if (direction == View.FOCUS_DOWN || direction == View.FOCUS_FORWARD) { while (mFirstPosition + getChildCount() < getItemCount() && newViewsHeight < mScrollDistance) { - View v = recycler.getViewForPosition(adapter, mFirstPosition + getChildCount()); + View v = recycler.getViewForPosition(mFirstPosition + getChildCount()); final int top = getChildAt(getChildCount() - 1).getBottom(); addView(v); measureChild(v, 0, 0); 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 c5ab703e6..baecf86a3 100644 --- a/samples/Support7Demos/src/com/example/android/supportv7/widget/RecyclerViewActivity.java +++ b/samples/Support7Demos/src/com/example/android/supportv7/widget/RecyclerViewActivity.java @@ -102,16 +102,8 @@ public class RecyclerViewActivity extends Activity { } @Override - public void onLayoutChildren(RecyclerView.Adapter adapter, RecyclerView.Recycler recycler, - boolean structureChanged, RecyclerView.State state) { - layoutChildren(adapter, recycler, structureChanged); - } - - @Override - public void layoutChildren(RecyclerView.Adapter adapter, RecyclerView.Recycler recycler, - boolean structureChanged) { + public void onLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State state) { final int parentBottom = getHeight() - getPaddingBottom(); - final View oldTopView = getChildCount() > 0 ? getChildAt(0) : null; int oldTop = getPaddingTop(); if (oldTopView != null) { @@ -125,16 +117,14 @@ public class RecyclerViewActivity extends Activity { final int left = getPaddingLeft(); final int right = getWidth() - getPaddingRight(); - final int count = adapter.getItemCount(); + final int count = state.getItemCount(); for (int i = 0; mFirstPosition + i < count && top < parentBottom; i++, top = bottom) { - View v = recycler.getViewForPosition(adapter, mFirstPosition + i); + View v = recycler.getViewForPosition(mFirstPosition + i); addView(v, i); measureChildWithMargins(v, 0, 0); bottom = top + getDecoratedMeasuredHeight(v); layoutDecorated(v, left, top, right, bottom); } - - removeAndRecycleScrap(recycler); } @Override @@ -149,8 +139,8 @@ public class RecyclerViewActivity extends Activity { } @Override - public int scrollVerticallyBy(int dy, RecyclerView.Adapter adapter, - RecyclerView.Recycler recycler) { + public int scrollVerticallyBy(int dy, RecyclerView.Recycler recycler, + RecyclerView.State state) { if (getChildCount() == 0) { return 0; } @@ -167,7 +157,7 @@ public class RecyclerViewActivity extends Activity { offsetChildrenVertical(scrollBy); if (mFirstPosition > 0 && scrolled > dy) { mFirstPosition--; - View v = recycler.getViewForPosition(adapter, mFirstPosition); + View v = recycler.getViewForPosition(mFirstPosition); addView(v, 0); measureChildWithMargins(v, 0, 0); final int bottom = getDecoratedTop(topView); @@ -187,8 +177,7 @@ public class RecyclerViewActivity extends Activity { scrolled -= scrollBy; offsetChildrenVertical(scrollBy); if (scrolled < dy && getItemCount() > mFirstPosition + getChildCount()) { - View v = recycler.getViewForPosition(adapter, - mFirstPosition + getChildCount()); + View v = recycler.getViewForPosition(mFirstPosition + getChildCount()); final int top = getDecoratedBottom(getChildAt(getChildCount() - 1)); addView(v); measureChildWithMargins(v, 0, 0); @@ -205,7 +194,7 @@ public class RecyclerViewActivity extends Activity { @Override public View onFocusSearchFailed(View focused, int direction, - RecyclerView.Adapter adapter, RecyclerView.Recycler recycler) { + RecyclerView.Recycler recycler, RecyclerView.State state) { final int oldCount = getChildCount(); if (oldCount == 0) { @@ -220,7 +209,7 @@ public class RecyclerViewActivity extends Activity { if (direction == View.FOCUS_UP || direction == View.FOCUS_BACKWARD) { while (mFirstPosition > 0 && newViewsHeight < mScrollDistance) { mFirstPosition--; - View v = recycler.getViewForPosition(adapter, mFirstPosition); + View v = recycler.getViewForPosition(mFirstPosition); final int bottom = getDecoratedTop(getChildAt(0)); addView(v, 0); measureChildWithMargins(v, 0, 0); @@ -235,7 +224,7 @@ public class RecyclerViewActivity extends Activity { if (direction == View.FOCUS_DOWN || direction == View.FOCUS_FORWARD) { while (mFirstPosition + getChildCount() < getItemCount() && newViewsHeight < mScrollDistance) { - View v = recycler.getViewForPosition(adapter, mFirstPosition + getChildCount()); + View v = recycler.getViewForPosition(mFirstPosition + getChildCount()); final int top = getDecoratedBottom(getChildAt(getChildCount() - 1)); addView(v); measureChildWithMargins(v, 0, 0);