diff options
| -rw-r--r-- | src/com/cyanogenmod/trebuchet/Launcher.java | 4 | ||||
| -rw-r--r-- | src/com/cyanogenmod/trebuchet/LauncherViewPropertyAnimator.java | 11 | ||||
| -rw-r--r-- | src/com/cyanogenmod/trebuchet/Workspace.java | 2 |
3 files changed, 15 insertions, 2 deletions
diff --git a/src/com/cyanogenmod/trebuchet/Launcher.java b/src/com/cyanogenmod/trebuchet/Launcher.java index 7569573e7..e2f35f23d 100644 --- a/src/com/cyanogenmod/trebuchet/Launcher.java +++ b/src/com/cyanogenmod/trebuchet/Launcher.java @@ -1566,6 +1566,10 @@ public final class Launcher extends Activity mWorkspace.exitWidgetResizeMode(); if (alreadyOnHome && mState == State.WORKSPACE && !mWorkspace.isTouchActive() && openFolder == null) { + if (mStateAnimation != null) { + mStateAnimation.end(); + mStateAnimation = null; + } mWorkspace.moveToDefaultScreen(true); mHotseat.moveToDefaultScreen(true); } diff --git a/src/com/cyanogenmod/trebuchet/LauncherViewPropertyAnimator.java b/src/com/cyanogenmod/trebuchet/LauncherViewPropertyAnimator.java index ee67b7fc2..3a00225a6 100644 --- a/src/com/cyanogenmod/trebuchet/LauncherViewPropertyAnimator.java +++ b/src/com/cyanogenmod/trebuchet/LauncherViewPropertyAnimator.java @@ -79,7 +79,16 @@ public class LauncherViewPropertyAnimator extends Animator implements AnimatorLi @Override public void end() { - throw new RuntimeException("Not implemented"); + 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); + } } @Override diff --git a/src/com/cyanogenmod/trebuchet/Workspace.java b/src/com/cyanogenmod/trebuchet/Workspace.java index 83314f397..bb74c6fe5 100644 --- a/src/com/cyanogenmod/trebuchet/Workspace.java +++ b/src/com/cyanogenmod/trebuchet/Workspace.java @@ -4455,7 +4455,7 @@ public class Workspace extends PagedView } void moveToDefaultScreen(boolean animate) { - if (!isSmall()) { + if (!isSmall() && !mIsSwitchingState) { if (animate) { snapToPage(mDefaultHomescreen); } else { |