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

Accessibility fixes for moving items

Browse Source 
am: 0270039b98

Change-Id: I856b8980817dd36785f27e203c0ee6174b24e568
This commit is contained in:
Tony Wickham
2017-05-12 21:29:15 +00:00
committed by android-build-merger
parent 9e00b3c503 0270039b98
commit 40d2702db4
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/launcher3/Workspace.java
View File

@@ -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);
}
}