diff options
| author | Nebojsa Cvetkovic <nebkat@gmail.com> | 2013-06-14 12:35:55 +0100 |
|---|---|---|
| committer | Jorge Ruesga <jorge@ruesga.com> | 2013-06-15 00:58:44 +0200 |
| commit | 57cba2e1fdd5b36640c93b052b075be7d2799205 (patch) | |
| tree | 25d33a13b01965a7f9fe1c06217bf698a83233c7 | |
| parent | 47947f91f666940312c86884efd171b14f03d0ca (diff) | |
| download | android_packages_apps_Trebuchet-57cba2e1fdd5b36640c93b052b075be7d2799205.tar.gz android_packages_apps_Trebuchet-57cba2e1fdd5b36640c93b052b075be7d2799205.tar.bz2 android_packages_apps_Trebuchet-57cba2e1fdd5b36640c93b052b075be7d2799205.zip | |
LauncherViewPropertyAnimator: Implement end()
Change-Id: Ifc15994ee64514e9e799285313d74dbc8fa134bd
| -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 7208a9ac1..0b5f29d14 100644 --- a/src/com/cyanogenmod/trebuchet/Launcher.java +++ b/src/com/cyanogenmod/trebuchet/Launcher.java @@ -1573,6 +1573,10 @@ public final class Launcher extends Activity boolean waitForPendingTranstions = true; if (alreadyOnHome && mState == State.WORKSPACE && !mWorkspace.isTouchActive() && openFolder == null) { + if (mStateAnimation != null) { + mStateAnimation.end(); + mStateAnimation = null; + } mWorkspace.moveToDefaultScreen(true); mHotseat.moveToDefaultScreen(true); waitForPendingTranstions = false; 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 065ac7140..3d5391618 100644 --- a/src/com/cyanogenmod/trebuchet/Workspace.java +++ b/src/com/cyanogenmod/trebuchet/Workspace.java @@ -4460,7 +4460,7 @@ public class Workspace extends PagedView } void moveToDefaultScreen(boolean animate) { - if (!isSmall()) { + if (!isSmall() && !mIsSwitchingState) { if (animate) { snapToPage(mDefaultHomescreen); } else { |