aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-02 08:56:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Don't stash immediately when drag was canceled" into tm-qpr-dev am: d9dd75d2cc

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

Change-Id: I5f1189de25670ff70fe5bc4b39ed4cbc41a676cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-03-31 01:23:49 +00:00
committed by Automerger Merge Worker
parent 99e6efe6f3 d9dd75d2cc
commit 552fe5ec52
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java
View File

@@ -457,9 +457,12 @@ public class TaskbarDragController extends DragController<BaseTaskbarContext> im
mControllers.taskbarAutohideSuspendController.updateFlag(
TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_DRAGGING, false);
mActivity.onDragEnd();
// Note, this must be done last to ensure no AutohideSuspendFlags are active, as that
// will prevent us from stashing until the timeout.
mControllers.taskbarStashController.updateAndAnimateTransientTaskbar(true);
if (mReturnAnimator == null) {
// Upon successful drag, immediately stash taskbar.
// Note, this must be done last to ensure no AutohideSuspendFlags are active, as
// that will prevent us from stashing until the timeout.
mControllers.taskbarStashController.updateAndAnimateTransientTaskbar(true);
}
}
}
@@ -493,8 +496,9 @@ public class TaskbarDragController extends DragController<BaseTaskbarContext> im
callOnDragEnd();
dragView.remove();
dragView.clearAnimation();
// Do this after callOnDragEnd(), because we use mReturnAnimator != null to
// imply the drag was canceled rather than successful.
mReturnAnimator = null;
}
});
mReturnAnimator.start();
@@ -556,6 +560,8 @@ public class TaskbarDragController extends DragController<BaseTaskbarContext> im
syncer.addToSync(syncId, viewRoot.getView());
syncer.addTransactionToSync(syncId, transaction);
syncer.markSyncReady(syncId);
// Do this after maybeOnDragEnd(), because we use mReturnAnimator != null to imply
// the drag was canceled rather than successful.
mReturnAnimator = null;
}
});