diff options
| author | Tony Wickham <twickham@google.com> | 2017-05-12 21:29:15 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-12 21:29:15 +0000 |
| commit | 40d2702db49fb5be84bf6418365a181ee4efd020 (patch) | |
| tree | 01d6014140b25abe92612a54c17c1c1e0e272a17 /src | |
| parent | 9e00b3c503df011bbd86cc86e8349cf4b35070d7 (diff) | |
| parent | 0270039b98ec2cb4e641c88dabea0ca157d55596 (diff) | |
| download | android_packages_apps_Trebuchet-40d2702db49fb5be84bf6418365a181ee4efd020.tar.gz android_packages_apps_Trebuchet-40d2702db49fb5be84bf6418365a181ee4efd020.tar.bz2 android_packages_apps_Trebuchet-40d2702db49fb5be84bf6418365a181ee4efd020.zip | |
Accessibility fixes for moving items
am: 0270039b98
Change-Id: I856b8980817dd36785f27e203c0ee6174b24e568
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 25e57495b..b3dd7ac60 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -2277,7 +2277,7 @@ public class Workspace extends PagedView mDragSourceInternal = (ShortcutAndWidgetContainer) child.getParent(); } - if (child instanceof BubbleTextView) { + if (child instanceof BubbleTextView && !dragOptions.isAccessibleDrag) { PopupContainerWithArrow popupContainer = PopupContainerWithArrow .showForIcon((BubbleTextView) child); if (popupContainer != null) { @@ -2529,6 +2529,8 @@ public class Workspace extends PagedView } } + boolean droppedOnOriginalCell = false; + int snapScreen = -1; boolean resizeOnDrop = false; if (d.dragSource != this) { @@ -2580,9 +2582,9 @@ public class Workspace extends PagedView minSpanY = item.minSpanY; } - droppedOnOriginalCellDuringTransition = mIsSwitchingState - && item.screenId == screenId && item.container == container + droppedOnOriginalCell = item.screenId == screenId && item.container == container && item.cellX == mTargetCell[0] && item.cellY == mTargetCell[1]; + droppedOnOriginalCellDuringTransition = droppedOnOriginalCell && mIsSwitchingState; // When quickly moving an item, a user may accidentally rearrange their // workspace. So instead we move the icon back safely to its original position. @@ -2717,7 +2719,7 @@ public class Workspace extends PagedView } parent.onDropChild(cell); } - if (d.stateAnnouncer != null) { + if (d.stateAnnouncer != null && !droppedOnOriginalCell) { d.stateAnnouncer.completeAction(R.string.item_moved); } } |