From 5121caf3143104bb8f0aaf87c47001754b366a85 Mon Sep 17 00:00:00 2001
From: Fabian Kozynski <kozynski@google.com>
Date: Wed, 23 Jun 2021 13:30:23 -0400
Subject: Properly clear animations after dragging

Test: manual, drag and release fast
Fixes: 176699404
Bug: 188640649
Change-Id: I1569c4d69622e9803be9524cb1ed2225d712a3b3
---
 .../src/com/android/systemui/qs/customize/TileAdapter.java       | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java b/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java
index d017c74b4306..b904505b6469 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java
@@ -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);
+        }
     };
 }
-- 
cgit v1.2.3-59-g8ed1b