diff options
| -rw-r--r-- | src/com/android/launcher2/AllApps3D.java | 7 | ||||
| -rw-r--r-- | src/com/android/launcher2/Workspace.java | 14 |
2 files changed, 9 insertions, 12 deletions
diff --git a/src/com/android/launcher2/AllApps3D.java b/src/com/android/launcher2/AllApps3D.java index 66d2540..d06624d 100644 --- a/src/com/android/launcher2/AllApps3D.java +++ b/src/com/android/launcher2/AllApps3D.java @@ -693,7 +693,12 @@ public class AllApps3D extends RSSurfaceView } public boolean onLongClick(View v) { - if (mLocks != 0 || !isVisible()) { + // We don't accept long click events in these cases + // - If the workspace isn't ready to accept a drop + // - If we're not done loading (because we might be confused about which item + // to pick up + // - If we're not visible + if (!isVisible() || mLauncher.isWorkspaceLocked() || mLocks != 0) { return true; } if (sRollo.checkClickOK() && mCurrentIconIndex == mDownIconIndex diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index e482e49..ba45b48 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -660,9 +660,7 @@ public class Workspace extends ViewGroup public boolean requestChildRectangleOnScreen(View child, Rect rectangle, boolean immediate) { int screen = indexOfChild(child); if (screen != mCurrentScreen || !mScroller.isFinished()) { - if (!mLauncher.isWorkspaceLocked()) { - snapToScreen(screen); - } + snapToScreen(screen); return true; } return false; @@ -729,8 +727,7 @@ public class Workspace extends ViewGroup if (ev.getAction() == MotionEvent.ACTION_DOWN) { // (In XLarge mode, the workspace is shrunken below all apps, and responds to taps // ie when you click on a mini-screen, it zooms back to that screen) - if (mLauncher.isWorkspaceLocked() || - (!LauncherApplication.isScreenXLarge() && mLauncher.isAllAppsVisible())) { + if (!LauncherApplication.isScreenXLarge() && mLauncher.isAllAppsVisible()) { return false; } } @@ -753,12 +750,11 @@ public class Workspace extends ViewGroup @Override public boolean onInterceptTouchEvent(MotionEvent ev) { - final boolean workspaceLocked = mLauncher.isWorkspaceLocked(); final boolean allAppsVisible = mLauncher.isAllAppsVisible(); // (In XLarge mode, the workspace is shrunken below all apps, and responds to taps // ie when you click on a mini-screen, it zooms back to that screen) - if (workspaceLocked || (!LauncherApplication.isScreenXLarge() && allAppsVisible)) { + if (!LauncherApplication.isScreenXLarge() && allAppsVisible) { return false; // We don't want the events. Let them fall through to the all apps view. } @@ -961,10 +957,6 @@ public class Workspace extends ViewGroup @Override public boolean onTouchEvent(MotionEvent ev) { - - if (mLauncher.isWorkspaceLocked()) { - return false; // We don't want the events. Let them fall through to the all apps view. - } if (mLauncher.isAllAppsVisible()) { // Cancel any scrolling that is in progress. if (!mScroller.isFinished()) { |