diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-06-08 16:52:41 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2015-06-08 19:22:27 -0700 |
commit | 45478022977de9025dfc887cc1507d90d15febf8 (patch) | |
tree | 4cf8588a4919102299e62ea01d68a0ae2aa2cb8a /src/com/android/launcher3/Launcher.java | |
parent | 208aba2dfd13afefc65afe66d8f9cf233a017365 (diff) | |
download | android_packages_apps_Trebuchet-45478022977de9025dfc887cc1507d90d15febf8.tar.gz android_packages_apps_Trebuchet-45478022977de9025dfc887cc1507d90d15febf8.tar.bz2 android_packages_apps_Trebuchet-45478022977de9025dfc887cc1507d90d15febf8.zip |
Tying accessibility drag lifecycle to that of dragController
Bug: 20865291
Change-Id: I1e0aceb20efcf4c32d76a656c499a1a4a5a32a65
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 076a6e657..796de3fa0 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -98,7 +98,6 @@ import android.widget.Toast; import com.android.launcher3.DropTarget.DragObject; import com.android.launcher3.PagedView.PageSwitchListener; -import com.android.launcher3.accessibility.LauncherAccessibilityDelegate; import com.android.launcher3.allapps.AllAppsContainerView; import com.android.launcher3.allapps.AppSearchManager; import com.android.launcher3.compat.AppWidgetManagerCompat; @@ -2470,9 +2469,8 @@ public class Launcher extends Activity return; } - LauncherAccessibilityDelegate delegate = - LauncherAppState.getInstance().getAccessibilityDelegate(); - if (delegate != null && delegate.onBackPressed()) { + if (mDragController.isDragging()) { + mDragController.cancelDrag(); return; } |