resolve conflicts w/4f174f1d27adbde6f50e11ee3a8eaf162a030284

Change-Id: I7ecce86e58af545aa18ea25e16978a1dce9dab8e
2012-07-25 15:04:00 -07:00
parent 90abcc9425 4f174f1d27
commit 8165f0dd20
6 changed files with 58 additions and 37 deletions
@@ -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) {