summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorge Ruesga <jorge@ruesga.com>2013-06-20 23:51:35 +0200
committerJorge Ruesga <jorge@ruesga.com>2013-06-21 00:03:56 +0200
commitdbedcf58f7dca2bb2991b59ef15ef1dff1abfdec (patch)
treef9dadbe00fdd4859f5b145bcb0772e1beb589f94
parenta23d9815568e9478984dabc441c16ffe41626890 (diff)
downloadandroid_packages_apps_Trebuchet-dbedcf58f7dca2bb2991b59ef15ef1dff1abfdec.tar.gz
android_packages_apps_Trebuchet-dbedcf58f7dca2bb2991b59ef15ef1dff1abfdec.tar.bz2
android_packages_apps_Trebuchet-dbedcf58f7dca2bb2991b59ef15ef1dff1abfdec.zip
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: I12fd3a8b0b71139b5744e462e97774d4c13e6466 Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
-rw-r--r--src/com/cyanogenmod/trebuchet/Launcher.java1
-rw-r--r--src/com/cyanogenmod/trebuchet/LauncherViewPropertyAnimator.java11
2 files changed, 1 insertions, 11 deletions
diff --git a/src/com/cyanogenmod/trebuchet/Launcher.java b/src/com/cyanogenmod/trebuchet/Launcher.java
index 0b5f29d14..43e25a730 100644
--- a/src/com/cyanogenmod/trebuchet/Launcher.java
+++ b/src/com/cyanogenmod/trebuchet/Launcher.java
@@ -1574,7 +1574,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 3a00225a6..ee67b7fc2 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