Merge "Properly clear animations after dragging" into sc-dev am: 2ce2d91d1e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15082257

Change-Id: Ic53e0587acc2b095cac34d124cce55550ea307f4
This commit is contained in:
TreeHugger Robot
2021-06-29 20:56:51 +00:00
committed by Automerger Merge Worker

View File

@@ -567,6 +567,8 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
public void clearDrag() {
itemView.clearAnimation();
itemView.setScaleX(1);
itemView.setScaleY(1);
}
public void startDrag() {
@@ -812,5 +814,12 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
@Override
public void onSwiped(ViewHolder viewHolder, int direction) {
}
// Just in case, make sure to animate to base state.
@Override
public void clearView(@NonNull RecyclerView recyclerView, @NonNull ViewHolder viewHolder) {
((Holder) viewHolder).stopDrag();
super.clearView(recyclerView, viewHolder);
}
};
}