summaryrefslogtreecommitdiffstats
path: root/src/com/cyanogenmod/trebuchet/AppsCustomizeTabHost.java
diff options
context:
space:
mode:
authornebkat <nebkat@teamhacksung.org>2012-12-25 15:33:18 +0000
committernebkat <nebkat@teamhacksung.org>2012-12-26 13:37:21 +0000
commit10a574501d4f4426ab5cec0a613b60d1d0baed44 (patch)
tree9f8718ecf66b46193d5eee04a947faf562318a73 /src/com/cyanogenmod/trebuchet/AppsCustomizeTabHost.java
parentb79406c0a85568dbc9150bbdb5339405b924f1fb (diff)
downloadandroid_packages_apps_Trebuchet-10a574501d4f4426ab5cec0a613b60d1d0baed44.tar.gz
android_packages_apps_Trebuchet-10a574501d4f4426ab5cec0a613b60d1d0baed44.tar.bz2
android_packages_apps_Trebuchet-10a574501d4f4426ab5cec0a613b60d1d0baed44.zip
Cleanup
Change-Id: Ied69f285305dbc3e1bf62676f23c47d6c6969e0a
Diffstat (limited to 'src/com/cyanogenmod/trebuchet/AppsCustomizeTabHost.java')
-rw-r--r--src/com/cyanogenmod/trebuchet/AppsCustomizeTabHost.java9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/com/cyanogenmod/trebuchet/AppsCustomizeTabHost.java b/src/com/cyanogenmod/trebuchet/AppsCustomizeTabHost.java
index 5bffe766e..af762ead0 100644
--- a/src/com/cyanogenmod/trebuchet/AppsCustomizeTabHost.java
+++ b/src/com/cyanogenmod/trebuchet/AppsCustomizeTabHost.java
@@ -179,11 +179,8 @@ public class AppsCustomizeTabHost extends TabHost implements LauncherTransitiona
public boolean onInterceptTouchEvent(MotionEvent ev) {
// 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);
- };
+ return mInTransition && mTransitioningToWorkspace || super.onInterceptTouchEvent(ev);
+ }
@Override
public boolean onTouchEvent(MotionEvent event) {
@@ -271,7 +268,7 @@ public class AppsCustomizeTabHost extends TabHost implements LauncherTransitiona
mAnimationBuffer.setVisibility(View.VISIBLE);
LayoutParams p = new FrameLayout.LayoutParams(child.getMeasuredWidth(),
child.getMeasuredHeight());
- p.setMargins((int) child.getLeft(), (int) child.getTop(), 0, 0);
+ p.setMargins(child.getLeft(), child.getTop(), 0, 0);
mAnimationBuffer.addView(child, p);
// Toggle the new content