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

am dcafbc3b: am 02c6b367: Merge "Remove deprecated API usage" into lmp-mr1-dev

Browse Source 
* commit 'dcafbc3b0cc6f2a7a2d70a6f887025a8ed447afd':
  Remove deprecated API usage
This commit is contained in:
Yigit Boyar
2014-11-21 22:04:08 +00:00
committed by Android Git Automerger
parent 0b1eeb9e81 dcafbc3b0c
commit 58476e2d52
4 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -124,8 +124,12 @@ public class AnimatedRecyclerView extends Activity {
public void itemClicked(View view) {
ViewGroup parent = (ViewGroup) view;
MyViewHolder holder = (MyViewHolder) mRecyclerView.getChildViewHolder(parent);
final int position = holder.getAdapterPosition();
if (position == RecyclerView.NO_POSITION) {
return;
}
mAdapter.toggleExpanded(holder);
mAdapter.notifyItemChanged(holder.getPosition());
mAdapter.notifyItemChanged(position);
}
public void deleteItem(View view) {
@@ -240,7 +244,7 @@ public class AnimatedRecyclerView extends Activity {
if (lastVisibleView != null) {
RecyclerView.LayoutParams lastParams =
(RecyclerView.LayoutParams) lastVisibleView.getLayoutParams();
int lastPosition = lastParams.getViewPosition();
int lastPosition = lastParams.getViewLayoutPosition();
final List<RecyclerView.ViewHolder> previousViews = recycler.getScrapList();
count = previousViews.size();
for (int i = 0; i < count; ++i) {
@@ -250,7 +254,7 @@ public class AnimatedRecyclerView extends Activity {
if (params.isItemRemoved()) {
continue;
}
int position = params.getViewPosition();
int position = params.getViewLayoutPosition();
int newTop;
if (position < mFirstPosition) {
newTop = view.getHeight() * (position - mFirstPosition);

5
samples/Support7Demos/src/com/example/android/supportv7/widget/BaseLayoutManagerActivity.java
View File

@@ -84,11 +84,10 @@ abstract public class BaseLayoutManagerActivity<T extends RecyclerView.LayoutMan
vh.itemView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
final int pos = vh.getPosition();
if (pos + 1 < getItemCount()) {
final int pos = vh.getAdapterPosition();
if (pos != RecyclerView.NO_POSITION && pos + 1 < getItemCount()) {
swap(pos, pos + 1);
}
notifyItemChanged(pos);
}
});
return vh;

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

@@ -119,11 +119,13 @@ public class GridLayoutManagerActivity extends BaseLayoutManagerActivity<GridLay
vh.itemView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
final int pos = vh.getPosition();
final int pos = vh.getAdapterPosition();
if (pos == RecyclerView.NO_POSITION) {
return;
}
if (pos + 1 < getItemCount()) {
swap(pos, pos + 1);
}
notifyItemChanged(pos);
}
});
return vh;

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

@@ -56,7 +56,10 @@ public class RecyclerViewActivity extends Activity {
vh.itemView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
final int pos = vh.getPosition();
final int pos = vh.getAdapterPosition();
if (pos == RecyclerView.NO_POSITION) {
return;
}
if (pos + 1 < getItemCount()) {
swap(pos, pos + 1);
}