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

am d9dbe909: am 620877f3: am b9767caa: Updated Support7Demos to follow RecyclerView API changes

Browse Source 
* commit 'd9dbe909a20e772b4d612de438addaaf628e9989':
  Updated Support7Demos to follow RecyclerView API changes
This commit is contained in:
Adam Powell
2014-01-29 18:01:28 +00:00
committed by Android Git Automerger
parent 1c58f8cda2 d9dbe909a2
commit 867992edcd
1 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,6 @@ package com.example.android.supportv7.widget;
import android.R; import android.R;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.graphics.Rect;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.view.MenuItemCompat; import android.support.v4.view.MenuItemCompat;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
@@ -93,7 +92,7 @@ public class RecyclerViewActivity extends Activity {
oldTop = oldTopView.getTop(); oldTop = oldTopView.getTop();
} }
recycler.scrapAllViewsAttached(); detachAndScrapAttachedViews(recycler);
int top = oldTop; int top = oldTop;
int bottom; int bottom;
@@ -104,13 +103,12 @@ public class RecyclerViewActivity extends Activity {
for (int i = 0; mFirstPosition + i < count && top < parentBottom; i++, top = bottom) { for (int i = 0; mFirstPosition + i < count && top < parentBottom; i++, top = bottom) {
View v = recycler.getViewForPosition(adapter, mFirstPosition + i); View v = recycler.getViewForPosition(adapter, mFirstPosition + i);
addView(v, i); addView(v, i);
v.measure(MeasureSpec.makeMeasureSpec(right - left, MeasureSpec.EXACTLY), measureChild(v, 0, 0);
MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));
bottom = top + v.getMeasuredHeight(); bottom = top + v.getMeasuredHeight();
v.layout(left, top, right, bottom); v.layout(left, top, right, bottom);
} }
recycler.detachDirtyScrapViews(); removeAndRecycleScrap(recycler);
} }
@Override @Override
@@ -145,8 +143,7 @@ public class RecyclerViewActivity extends Activity {
mFirstPosition--; mFirstPosition--;
View v = recycler.getViewForPosition(adapter, mFirstPosition); View v = recycler.getViewForPosition(adapter, mFirstPosition);
addView(v, 0); addView(v, 0);
v.measure(MeasureSpec.makeMeasureSpec(right - left, MeasureSpec.EXACTLY), measureChild(v, 0, 0);
MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));
final int bottom = topView.getTop(); // TODO decorated top? final int bottom = topView.getTop(); // TODO decorated top?
final int top = bottom - v.getMeasuredHeight(); final int top = bottom - v.getMeasuredHeight();
v.layout(left, top, right, bottom); v.layout(left, top, right, bottom);
@@ -167,8 +164,7 @@ public class RecyclerViewActivity extends Activity {
mFirstPosition + getChildCount()); mFirstPosition + getChildCount());
final int top = getChildAt(getChildCount() - 1).getBottom(); final int top = getChildAt(getChildCount() - 1).getBottom();
addView(v); addView(v);
v.measure(MeasureSpec.makeMeasureSpec(right - left, MeasureSpec.EXACTLY), measureChild(v, 0, 0);
MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));
final int bottom = top + v.getMeasuredHeight(); final int bottom = top + v.getMeasuredHeight();
v.layout(left, top, right, bottom); v.layout(left, top, right, bottom);
} else { } else {
@@ -176,7 +172,7 @@ public class RecyclerViewActivity extends Activity {
} }
} }
} }
detachAndScrapViewsOutOfBounds(recycler); recycleViewsOutOfBounds(recycler);
return scrolled; return scrolled;
} }
@@ -200,8 +196,7 @@ public class RecyclerViewActivity extends Activity {
View v = recycler.getViewForPosition(adapter, mFirstPosition); View v = recycler.getViewForPosition(adapter, mFirstPosition);
final int bottom = getChildAt(0).getTop(); // TODO decorated top? final int bottom = getChildAt(0).getTop(); // TODO decorated top?
addView(v, 0); addView(v, 0);
v.measure(MeasureSpec.makeMeasureSpec(right - left, MeasureSpec.EXACTLY), measureChild(v, 0, 0);
MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));
final int top = bottom - v.getMeasuredHeight(); final int top = bottom - v.getMeasuredHeight();
v.layout(left, top, right, bottom); v.layout(left, top, right, bottom);
if (v.isFocusable()) { if (v.isFocusable()) {
@@ -216,8 +211,7 @@ public class RecyclerViewActivity extends Activity {
View v = recycler.getViewForPosition(adapter, mFirstPosition + getChildCount()); View v = recycler.getViewForPosition(adapter, mFirstPosition + getChildCount());
final int top = getChildAt(getChildCount() - 1).getBottom(); final int top = getChildAt(getChildCount() - 1).getBottom();
addView(v); addView(v);
v.measure(MeasureSpec.makeMeasureSpec(right - left, MeasureSpec.EXACTLY), measureChild(v, 0, 0);
MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));
final int bottom = top + v.getMeasuredHeight(); final int bottom = top + v.getMeasuredHeight();
v.layout(left, top, right, bottom); v.layout(left, top, right, bottom);
if (v.isFocusable()) { if (v.isFocusable()) {
@@ -230,7 +224,7 @@ public class RecyclerViewActivity extends Activity {
return toFocus; return toFocus;
} }
public void detachAndScrapViewsOutOfBounds(RecyclerView.Recycler recycler) { public void recycleViewsOutOfBounds(RecyclerView.Recycler recycler) {
final int childCount = getChildCount(); final int childCount = getChildCount();
final int parentWidth = getWidth(); final int parentWidth = getWidth();
final int parentHeight = getHeight(); final int parentHeight = getHeight();
@@ -249,10 +243,10 @@ public class RecyclerViewActivity extends Activity {
} }
} }
for (int i = childCount - 1; i > last; i--) { for (int i = childCount - 1; i > last; i--) {
recycler.detachAndScrapView(getChildAt(i)); removeAndRecycleViewAt(i, recycler);
} }
for (int i = first - 1; i >= 0; i--) { for (int i = first - 1; i >= 0; i--) {
recycler.detachAndScrapView(getChildAt(i)); removeAndRecycleViewAt(i, recycler);
} }
if (getChildCount() == 0) { if (getChildCount() == 0) {
mFirstPosition = 0; mFirstPosition = 0;