summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorge Ruesga <jorge@ruesga.com>2013-06-20 21:51:35 (GMT)
committerJorge Ruesga <jorge@ruesga.com>2013-06-20 21:51:35 (GMT)
commit0827ce7a634435f515aee66cd128c9a1684d17e2 (patch)
tree4382c1c36edf86aadf34ee28ef91b142c225eadb
parent2c5395b457f9fe737f4101ba54d32fad3f4796a5 (diff)
downloadandroid_packages_apps_Trebuchet-0827ce7a634435f515aee66cd128c9a1684d17e2.zip
android_packages_apps_Trebuchet-0827ce7a634435f515aee66cd128c9a1684d17e2.tar.gz
android_packages_apps_Trebuchet-0827ce7a634435f515aee66cd128c9a1684d17e2.tar.bz2
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 <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 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