diff options
author | Tony Wickham <twickham@google.com> | 2017-05-11 15:20:28 -0700 |
---|---|---|
committer | Tony Wickham <twickham@google.com> | 2017-05-11 15:20:28 -0700 |
commit | 0270039b98ec2cb4e641c88dabea0ca157d55596 (patch) | |
tree | f4448cff75c778cb383960e739f270a3edacf1a6 /src | |
parent | 5cfde85cb6d095585b932d9e3e2c4fe78aa0dafe (diff) | |
download | android_packages_apps_Trebuchet-0270039b98ec2cb4e641c88dabea0ca157d55596.tar.gz android_packages_apps_Trebuchet-0270039b98ec2cb4e641c88dabea0ca157d55596.tar.bz2 android_packages_apps_Trebuchet-0270039b98ec2cb4e641c88dabea0ca157d55596.zip |
Accessibility fixes for moving items
- Don't open popup when using "move item" action
- Don't announce "Item moved" if dropping on original cell
Bug: 33501751
Change-Id: I7236cd51fc00c357a1d7597e2fcb68c3a7c16b0b
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 369d80d77..36f2880cb 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -2272,7 +2272,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) { @@ -2524,6 +2524,8 @@ public class Workspace extends PagedView } } + boolean droppedOnOriginalCell = false; + int snapScreen = -1; boolean resizeOnDrop = false; if (d.dragSource != this) { @@ -2575,9 +2577,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. @@ -2712,7 +2714,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); } } |