From 678862186af4ea70d9b4012c9bc127e7fea5e607 Mon Sep 17 00:00:00 2001 From: Joe Onorato Date: Mon, 14 Sep 2009 19:05:05 -0400 Subject: Get drag and drop working again. --- src/com/android/launcher2/HandleView.java | 2 +- src/com/android/launcher2/Workspace.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/com/android/launcher2/HandleView.java b/src/com/android/launcher2/HandleView.java index 7d2269a8d..eebc3ab5d 100644 --- a/src/com/android/launcher2/HandleView.java +++ b/src/com/android/launcher2/HandleView.java @@ -49,7 +49,7 @@ public class HandleView extends ImageView { @Override public View focusSearch(int direction) { View newFocus = super.focusSearch(direction); - if (newFocus == null && mLauncher.isAllAppsVisible()) { + if (newFocus == null && !mLauncher.isAllAppsVisible()) { final Workspace workspace = mLauncher.getWorkspace(); workspace.dispatchUnhandledMove(null, direction); return (mOrientation == ORIENTATION_HORIZONTAL && direction == FOCUS_DOWN) ? diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index 074fc8705..9191bc665 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -600,7 +600,7 @@ public class Workspace extends ViewGroup implements DropTarget, DragSource, Drag @Override protected boolean onRequestFocusInDescendants(int direction, Rect previouslyFocusedRect) { - if (mLauncher.isAllAppsVisible()) { + if (!mLauncher.isAllAppsVisible()) { final Folder openFolder = getOpenFolder(); if (openFolder != null) { return openFolder.requestFocus(direction, previouslyFocusedRect); @@ -635,7 +635,7 @@ public class Workspace extends ViewGroup implements DropTarget, DragSource, Drag @Override public void addFocusables(ArrayList views, int direction, int focusableMode) { - if (mLauncher.isAllAppsVisible()) { + if (!mLauncher.isAllAppsVisible()) { final Folder openFolder = getOpenFolder(); if (openFolder == null) { getChildAt(mCurrentScreen).addFocusables(views, direction); @@ -656,7 +656,7 @@ public class Workspace extends ViewGroup implements DropTarget, DragSource, Drag @Override public boolean onInterceptTouchEvent(MotionEvent ev) { - if (mLauncher.isWorkspaceLocked() || !mLauncher.isAllAppsVisible()) { + if (mLauncher.isWorkspaceLocked() || mLauncher.isAllAppsVisible()) { return false; // We don't want the events. Let them fall through to the all apps view. } @@ -766,7 +766,7 @@ public class Workspace extends ViewGroup implements DropTarget, DragSource, Drag @Override public boolean onTouchEvent(MotionEvent ev) { - if (mLauncher.isWorkspaceLocked() || !mLauncher.isAllAppsVisible()) { + if (mLauncher.isWorkspaceLocked() || mLauncher.isAllAppsVisible()) { return false; // We don't want the events. Let them fall through to the all apps view. } -- cgit v1.2.3