From ac08f4b93e075fd90c8689509ad3108284a717d8 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Fri, 27 Apr 2012 15:41:00 -0700 Subject: Fixing issue where you can not swipe AllApps while transitioning to AllApps. (Bug 6389985) Change-Id: Idce57a6a3fffffa800d33c1b5b528d36174bb511 --- src/com/android/launcher2/AppsCustomizeTabHost.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/com/android/launcher2/AppsCustomizeTabHost.java b/src/com/android/launcher2/AppsCustomizeTabHost.java index 01c08c9..50c80aa 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); } } -- cgit v1.1