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

am 52af2550: Don\'t layout removed scrap views

Browse Source 
* commit '52af255018b0c56c4a35dfedf10720e7d4792bbc':
  Don't layout removed scrap views
This commit is contained in:
Yigit Boyar
2014-10-02 17:56:23 +00:00
committed by Android Git Automerger
parent 513c112f91 52af255018
commit 5ea5cc3d8e
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -219,9 +219,7 @@ 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()) { 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);
@@ -230,7 +228,7 @@ public class AnimatedRecyclerView extends Activity {
} }
} }
if (mAnimationsEnabled && mPredictiveAnimationsEnabled) { if (mAnimationsEnabled && mPredictiveAnimationsEnabled && !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
@@ -249,6 +247,9 @@ public class AnimatedRecyclerView extends Activity {
View view = previousViews.get(i).itemView; View view = previousViews.get(i).itemView;
RecyclerView.LayoutParams params = RecyclerView.LayoutParams params =
(RecyclerView.LayoutParams) view.getLayoutParams(); (RecyclerView.LayoutParams) view.getLayoutParams();
if (params.isItemRemoved()) {
continue;
}
int position = params.getViewPosition(); int position = params.getViewPosition();
int newTop; int newTop;
if (position < mFirstPosition) { if (position < mFirstPosition) {