Get drag and drop working again.
This commit is contained in:
@@ -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) ?
|
||||
|
||||
@@ -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.
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user