diff options
author | Winson Chung <winsonc@google.com> | 2012-04-27 15:55:31 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-04-27 15:55:31 -0700 |
commit | 3b3931436274166977488771ae04b3946f497f2a (patch) | |
tree | 1aae456c6292092b2f7c7c4cac113fd2b8348b72 | |
parent | ef6f2f5ac106f7ac6f312196a10964f49dce71c6 (diff) | |
parent | 33941668f6ed82fa8b0ea0b7ac3c21d7d911c1c1 (diff) | |
download | android_packages_apps_Trebuchet-3b3931436274166977488771ae04b3946f497f2a.tar.gz android_packages_apps_Trebuchet-3b3931436274166977488771ae04b3946f497f2a.tar.bz2 android_packages_apps_Trebuchet-3b3931436274166977488771ae04b3946f497f2a.zip |
am 33941668: Merge "Fixing issue where you can not swipe AllApps while transitioning to AllApps. (Bug 6389985)" into jb-dev
* commit '33941668f6ed82fa8b0ea0b7ac3c21d7d911c1c1':
Fixing issue where you can not swipe AllApps while transitioning to AllApps. (Bug 6389985)
-rw-r--r-- | src/com/android/launcher2/AppsCustomizeTabHost.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/com/android/launcher2/AppsCustomizeTabHost.java b/src/com/android/launcher2/AppsCustomizeTabHost.java index 01c08c916..50c80aaf8 100644 --- a/src/com/android/launcher2/AppsCustomizeTabHost.java +++ b/src/com/android/launcher2/AppsCustomizeTabHost.java @@ -164,8 +164,9 @@ public class AppsCustomizeTabHost extends TabHost implements LauncherTransitiona } public boolean onInterceptTouchEvent(MotionEvent ev) { - // If we are mid transition then intercept touch events here so we can ignore them - if (mInTransition) { + // If we are mid transitioning to the workspace, then intercept touch events here so we + // can ignore them, otherwise we just let all apps handle the touch events. + if (mInTransition && mTransitioningToWorkspace) { return true; } return super.onInterceptTouchEvent(ev); @@ -173,9 +174,8 @@ public class AppsCustomizeTabHost extends TabHost implements LauncherTransitiona @Override public boolean onTouchEvent(MotionEvent event) { - // Allow touch events to fall through if we are transitioning to the workspace - if (mInTransition) { - if (mTransitioningToWorkspace) { + // Allow touch events to fall through to the workspace if we are transitioning there + if (mInTransition && mTransitioningToWorkspace) { return super.onTouchEvent(event); } } |