Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0827ce7a authored by Jorge Ruesga's avatar Jorge Ruesga
Browse files

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: default avatarJorge Ruesga <jorge@ruesga.com>
parent 2c5395b4

src/com/cyanogenmod/trebuchet/Launcher.java

+0 −1
Original line number Diff line number Diff line
@@ -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);

src/com/cyanogenmod/trebuchet/LauncherViewPropertyAnimator.java

+1 −10
Original line number Diff line number Diff line
@@ -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