am a276fc59: Fix 2306862 - Launcher2 crashed: in libs/rs. Uploading texture without a context.

Merge commit 'a276fc59f535a2fb05701e8f49bb7adf4cefb3b2' into eclair-mr2

* commit 'a276fc59f535a2fb05701e8f49bb7adf4cefb3b2':
  Fix 2306862 - Launcher2 crashed: in libs/rs.  Uploading texture without a context.
This commit is contained in:
Joe Onorato authored and Android Git Automerger committed 2009-12-08 17:19:08 -08:00
commit 546917a5ad
2 files changed
+16 -11

No files matched your search

-1
View File
@@ -565,7 +565,6 @@ public class Workspace extends ViewGroup implements DropTarget, DragSource, Drag
public boolean onInterceptTouchEvent(MotionEvent ev) {
final boolean workspaceLocked = mLauncher.isWorkspaceLocked();
final boolean allAppsVisible = mLauncher.isAllAppsVisible();
Log.d(TAG, "workspaceLocked=" + workspaceLocked + " allAppsVisible=" + allAppsVisible);
if (workspaceLocked || allAppsVisible) {
return false; // We don't want the events. Let them fall through to the all apps view.
}