Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c1d2b5d authored by Mady Mellor's avatar Mady Mellor Committed by Automerger Merge Worker
Browse files

Fix crash/flicker with taskbar when canceling drag and drop am: 729eb845 am: 0cb7c659 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17776925



Change-Id: Ida1ee71762e25c7b09dd9ff6837a4ad8aea4ab15
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2e875296 0cb7c659

quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java

+1 −2
Original line number Diff line number Diff line
@@ -477,7 +477,6 @@ public class TaskbarDragController extends DragController<BaseTaskbarContext> im 
                tx.setScale(dragSurface, scale, scale);

                tx.setAlpha(dragSurface, alpha);

                tx.apply();

                tx.close();

            }

        });

        mReturnAnimator.addListener(new AnimatorListenerAdapter() {
@@ -498,6 +497,7 @@ public class TaskbarDragController extends DragController<BaseTaskbarContext> im 
            }



            private void cleanUpSurface() {

                tx.close();

                maybeOnDragEnd();

                // Synchronize removing the drag surface with the next draw after calling

                // maybeOnDragEnd()
@@ -508,7 +508,6 @@ public class TaskbarDragController extends DragController<BaseTaskbarContext> im 
                syncer.addToSync(syncId, viewRoot.getView());

                syncer.addTransactionToSync(syncId, transaction);

                syncer.markSyncReady(syncId);



                mReturnAnimator = null;

            }

        });