summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2012-04-27 16:05:57 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-04-27 16:05:57 -0700
commit1d85f66a6df11bea4d0e34a8d40a7182245141c3 (patch)
treedc31c608170f0c8212d99e24f935f309add773d0
parent3b3931436274166977488771ae04b3946f497f2a (diff)
parent21fadeaad1f5a662df425085551c6f54e8c28f52 (diff)
downloadandroid_packages_apps_Trebuchet-1d85f66a6df11bea4d0e34a8d40a7182245141c3.tar.gz
android_packages_apps_Trebuchet-1d85f66a6df11bea4d0e34a8d40a7182245141c3.tar.bz2
android_packages_apps_Trebuchet-1d85f66a6df11bea4d0e34a8d40a7182245141c3.zip
am 21fadeaa: Fixing build.
* commit '21fadeaad1f5a662df425085551c6f54e8c28f52': Fixing build.
-rw-r--r--src/com/android/launcher2/AppsCustomizeTabHost.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/launcher2/AppsCustomizeTabHost.java b/src/com/android/launcher2/AppsCustomizeTabHost.java
index 50c80aaf8..7a2c247c6 100644
--- a/src/com/android/launcher2/AppsCustomizeTabHost.java
+++ b/src/com/android/launcher2/AppsCustomizeTabHost.java
@@ -176,8 +176,7 @@ public class AppsCustomizeTabHost extends TabHost implements LauncherTransitiona
public boolean onTouchEvent(MotionEvent event) {
// Allow touch events to fall through to the workspace if we are transitioning there
if (mInTransition && mTransitioningToWorkspace) {
- return super.onTouchEvent(event);
- }
+ return super.onTouchEvent(event);
}
// Intercept all touch events up to the bottom of the AppsCustomizePane so they do not fall