diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-11-05 12:14:58 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2012-11-05 12:14:58 -0800 |
| commit | f5baac88b85efa794ae7909f784538f379dd36f2 (patch) | |
| tree | c55b82edcaae558d71fc12f856bb93d9ae8ce8dc /src/com/cyanogenmod/trebuchet/PagedViewWithDraggableItems.java | |
| parent | 5bf25aecb90bd49ca3a8affea877e570b75baed6 (diff) | |
| parent | 4124016ae5c8174aa53433894b896604ffa52c67 (diff) | |
| download | packages_apps_trebuchet-f5baac88b85efa794ae7909f784538f379dd36f2.zip packages_apps_trebuchet-f5baac88b85efa794ae7909f784538f379dd36f2.tar.gz packages_apps_trebuchet-f5baac88b85efa794ae7909f784538f379dd36f2.tar.bz2 | |
Merge branch 'master' of https://android.googlesource.com/platform/packages/apps/Launcher2 into aosp
Conflicts:
res/layout-land/drop_target_bar.xml
src/com/cyanogenmod/trebuchet/AppsCustomizeTabHost.java
src/com/cyanogenmod/trebuchet/Launcher.java
src/com/cyanogenmod/trebuchet/LauncherModel.java
Change-Id: I5aa702e333da27645b0d765b233f4d8a89991cb9
Diffstat (limited to 'src/com/cyanogenmod/trebuchet/PagedViewWithDraggableItems.java')
| -rw-r--r-- | src/com/cyanogenmod/trebuchet/PagedViewWithDraggableItems.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/cyanogenmod/trebuchet/PagedViewWithDraggableItems.java b/src/com/cyanogenmod/trebuchet/PagedViewWithDraggableItems.java index 694c3c7..1f0befa 100644 --- a/src/com/cyanogenmod/trebuchet/PagedViewWithDraggableItems.java +++ b/src/com/cyanogenmod/trebuchet/PagedViewWithDraggableItems.java @@ -105,7 +105,7 @@ public abstract class PagedViewWithDraggableItems extends PagedView // Return early if we are still animating the pages if (mNextPage != INVALID_PAGE) return false; // When we have exited all apps or are in transition, disregard long clicks - if (!mLauncher.isAllAppsCustomizeOpen() || + if (!mLauncher.isAllAppsVisible() || mLauncher.getWorkspace().isSwitchingState()) return false; // Return if global dragging is not enabled if (!mLauncher.isDraggingEnabled()) return false; |