diff options
author | Joe Onorato <joeo@android.com> | 2009-09-24 17:51:01 -0700 |
---|---|---|
committer | Joe Onorato <joeo@android.com> | 2009-09-25 09:17:07 -0700 |
commit | 7bb1749c69384faf00b238f0684d3b2e23406451 (patch) | |
tree | 6610a2528260fa55b1921feef192895e6f53af8d /src/com/android/launcher2/Workspace.java | |
parent | 6467f30eb638ae3bf07be1ead1fb93023fd83ba1 (diff) | |
download | android_packages_apps_Trebuchet-7bb1749c69384faf00b238f0684d3b2e23406451.tar.gz android_packages_apps_Trebuchet-7bb1749c69384faf00b238f0684d3b2e23406451.tar.bz2 android_packages_apps_Trebuchet-7bb1749c69384faf00b238f0684d3b2e23406451.zip |
work around and fix bugs
- Make rollo always draw. This works around the bug somewhere that makes
it show gray when all apps shold be closed
- Simplify the SwipeController now that we're not zooming the workspace.
- Make the readback data sane by splitting it to a different allocation.
Now there is one allocation for each direction of data flow.
- Make AllAppsView.isVisible return the correct value.
Diffstat (limited to 'src/com/android/launcher2/Workspace.java')
-rw-r--r-- | src/com/android/launcher2/Workspace.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index 37a244464..cc09bdbd9 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -37,6 +37,7 @@ import android.widget.Scroller; import android.widget.TextView; import android.os.Parcelable; import android.os.Parcel; +import android.util.Log; import java.util.ArrayList; @@ -46,6 +47,7 @@ import java.util.ArrayList; * A workspace is meant to be used with a fixed width only. */ public class Workspace extends ViewGroup implements DropTarget, DragSource, DragScroller { + private static final String TAG = "Launcher.Workspace"; private static final int INVALID_SCREEN = -1; /** @@ -647,6 +649,16 @@ public class Workspace extends ViewGroup implements DropTarget, DragSource, Drag } @Override + public boolean dispatchTouchEvent(MotionEvent ev) { + if (ev.getAction() == MotionEvent.ACTION_DOWN) { + if (mLauncher.isWorkspaceLocked() || mLauncher.isAllAppsVisible()) { + return false; + } + } + return super.dispatchTouchEvent(ev); + } + + @Override public boolean onInterceptTouchEvent(MotionEvent ev) { if (mLauncher.isWorkspaceLocked() || mLauncher.isAllAppsVisible()) { return false; // We don't want the events. Let them fall through to the all apps view. |