From 0827ce7a634435f515aee66cd128c9a1684d17e2 Mon Sep 17 00:00:00 2001 From: Jorge Ruesga Date: Thu, 20 Jun 2013 23:51:35 +0200 Subject: Trebuchet: Revert animation end Since moveToDefaultScreen is protected by mIsSwitchingState, no animation is triggered when the home screen is double tapped. Now, cancel the animation is causing icons to disappear. Change-Id: I3838a02d7afc4a40343c593ea743d1773bbc3cfd Signed-off-by: Jorge Ruesga --- src/com/cyanogenmod/trebuchet/Launcher.java | 1 - .../cyanogenmod/trebuchet/LauncherViewPropertyAnimator.java | 11 +---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/com/cyanogenmod/trebuchet/Launcher.java b/src/com/cyanogenmod/trebuchet/Launcher.java index e2f35f2..eb7f090 100644 --- a/src/com/cyanogenmod/trebuchet/Launcher.java +++ b/src/com/cyanogenmod/trebuchet/Launcher.java @@ -1567,7 +1567,6 @@ public final class Launcher extends Activity if (alreadyOnHome && mState == State.WORKSPACE && !mWorkspace.isTouchActive() && openFolder == null) { if (mStateAnimation != null) { - mStateAnimation.end(); mStateAnimation = null; } mWorkspace.moveToDefaultScreen(true); diff --git a/src/com/cyanogenmod/trebuchet/LauncherViewPropertyAnimator.java b/src/com/cyanogenmod/trebuchet/LauncherViewPropertyAnimator.java index 3a00225..ee67b7f 100644 --- a/src/com/cyanogenmod/trebuchet/LauncherViewPropertyAnimator.java +++ b/src/com/cyanogenmod/trebuchet/LauncherViewPropertyAnimator.java @@ -79,16 +79,7 @@ public class LauncherViewPropertyAnimator extends Animator implements AnimatorLi @Override public void end() { - if (mViewPropertyAnimator != null) { - mViewPropertyAnimator.cancel(); - mTarget.setTranslationX(mTranslationX); - mTarget.setTranslationY(mTranslationY); - mTarget.setScaleX(mScaleX); - mTarget.setScaleY(mScaleY); - mTarget.setRotation(mRotation); - mTarget.setRotationY(mRotationY); - mTarget.setAlpha(mAlpha); - } + throw new RuntimeException("Not implemented"); } @Override -- cgit v1.1