diff options
| author | Joe Onorato <joeo@android.com> | 2009-09-14 19:05:05 -0400 |
|---|---|---|
| committer | Joe Onorato <joeo@android.com> | 2009-09-14 19:05:05 -0400 |
| commit | 678862186af4ea70d9b4012c9bc127e7fea5e607 (patch) | |
| tree | 56ec59b90a78fa1592f2cb12bf78555fb53ef7f5 | |
| parent | a9c28f6f97a4b34d9527c786e3aa8f02d92d9e07 (diff) | |
| download | android_packages_apps_Trebuchet-678862186af4ea70d9b4012c9bc127e7fea5e607.tar.gz android_packages_apps_Trebuchet-678862186af4ea70d9b4012c9bc127e7fea5e607.tar.bz2 android_packages_apps_Trebuchet-678862186af4ea70d9b4012c9bc127e7fea5e607.zip | |
Get drag and drop working again.
| -rw-r--r-- | src/com/android/launcher2/HandleView.java | 2 | ||||
| -rw-r--r-- | 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<View> 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. } |