Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I2360b7a9740ff356cf4c9e9a0ac96e53ac0b7f12
This commit is contained in:
TreeHugger Robot
2021-06-29 20:55:34 +00:00
committed by Automerger Merge Worker
parent fa23a322ea 2ce2d91d1e
commit 6a277f9cae
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java
View File

@@ -567,6 +567,8 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
public void clearDrag() { public void clearDrag() {
itemView.clearAnimation(); itemView.clearAnimation();
itemView.setScaleX(1);
itemView.setScaleY(1);
} }
public void startDrag() { public void startDrag() {
@@ -812,5 +814,12 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
@Override @Override
public void onSwiped(ViewHolder viewHolder, int direction) { 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);
}
}; };
} }