Merge "Set PredictedAppIcon ring disabled when icon is disabled" into tm-qpr-dev am: f93aa98e3a am: b04aeba66b

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

Change-Id: Id47004d671ec6f4493217a9e50007b25296e1474
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tony Wickham authored and Automerger Merge Worker committed 2023-03-22 19:58:53 +00:00
commit 89501aede7
3 files changed
+25 -3

No files matched your search

@@ -159,7 +159,7 @@ public class TaskbarDragController extends DragController<BaseTaskbarContext> im
if (iconShift != null) {
dragView.animateShift(-iconShift.x, -iconShift.y);
}
btv.getIcon().setIsDisabled(true);
btv.setIconDisabled(true);
mControllers.taskbarAutohideSuspendController.updateFlag(
TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_DRAGGING, true);
});
@@ -453,7 +453,7 @@ public class TaskbarDragController extends DragController<BaseTaskbarContext> im
private void maybeOnDragEnd() {
if (!isDragging()) {
((BubbleTextView) mDragObject.originalView).getIcon().setIsDisabled(false);
((BubbleTextView) mDragObject.originalView).setIconDisabled(false);
mControllers.taskbarAutohideSuspendController.updateFlag(
TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_DRAGGING, false);
mActivity.onDragEnd();