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

Merge "DO NOT MERGE Disable predictive animations in RecyclerView demo" into lmp-preview-dev

Browse Source
This commit is contained in:
Yigit Boyar
2014-06-11 23:43:48 +00:00
committed by Android (Google) Code Review
parent 410bcade76 365d701866
commit 6f28e3a933
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -194,18 +194,18 @@ public class AnimatedRecyclerView extends Activity {
View v = recycler.getViewForPosition(mFirstPosition + i); View v = recycler.getViewForPosition(mFirstPosition + i);
RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) v.getLayoutParams(); RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) v.getLayoutParams();
if (!mPredictiveAnimationsEnabled || !params.isItemRemoved()) { if (!state.isPreLayout() || !params.isItemRemoved()) {
addView(v); addView(v);
} }
measureChild(v, 0, 0); measureChild(v, 0, 0);
bottom = top + v.getMeasuredHeight(); bottom = top + v.getMeasuredHeight();
v.layout(left, top, right, bottom); v.layout(left, top, right, bottom);
if (mPredictiveAnimationsEnabled && params.isItemRemoved()) { if (state.isPreLayout() && params.isItemRemoved()) {
parentBottom += v.getHeight(); parentBottom += v.getHeight();
} }
} }
if (mAnimationsEnabled && mPredictiveAnimationsEnabled) { if (mAnimationsEnabled && state.isPreLayout()) {
// Now that we've run a full layout, figure out which views were not used // Now that we've run a full layout, figure out which views were not used
// (cached in previousViews). For each of these views, position it where // (cached in previousViews). For each of these views, position it where
// it would go, according to its position relative to the visible // it would go, according to its position relative to the visible