diff options
| author | Ed Heyl <ed@google.com> | 2012-07-25 15:04:00 -0700 |
|---|---|---|
| committer | Ed Heyl <ed@google.com> | 2012-07-25 15:04:00 -0700 |
| commit | 8165f0dd202a2c0fbf0816f7613d66938955dc76 (patch) | |
| tree | 2c14522ad8a3a3150417c53664c0266874a76fc8 /src/com/android/launcher2/AppsCustomizePagedView.java | |
| parent | 90abcc94258ba9d9c8b68ac9764b6ab1eba12985 (diff) | |
| parent | 4f174f1d27adbde6f50e11ee3a8eaf162a030284 (diff) | |
| download | android_packages_apps_Trebuchet-8165f0dd202a2c0fbf0816f7613d66938955dc76.tar.gz android_packages_apps_Trebuchet-8165f0dd202a2c0fbf0816f7613d66938955dc76.tar.bz2 android_packages_apps_Trebuchet-8165f0dd202a2c0fbf0816f7613d66938955dc76.zip | |
resolve conflicts w/4f174f1d27adbde6f50e11ee3a8eaf162a030284
Change-Id: I7ecce86e58af545aa18ea25e16978a1dce9dab8e
Diffstat (limited to 'src/com/android/launcher2/AppsCustomizePagedView.java')
| -rw-r--r-- | src/com/android/launcher2/AppsCustomizePagedView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java index 80fc62fce..d52c384bd 100644 --- a/src/com/android/launcher2/AppsCustomizePagedView.java +++ b/src/com/android/launcher2/AppsCustomizePagedView.java @@ -559,7 +559,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen @Override public void onClick(View v) { // When we have exited all apps or are in transition, disregard clicks - if (!mLauncher.isAllAppsCustomizeOpen() || + if (!mLauncher.isAllAppsVisible() || mLauncher.getWorkspace().isSwitchingState()) return; if (v instanceof PagedViewIcon) { |