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

Commit fa9e38bd authored by Nebojsa Cvetkovic's avatar Nebojsa Cvetkovic
Browse files

LauncherViewPropertyAnimator: Implement end() 

Change-Id: Ic7a0c98b937dc5fc8d429ab38303865dae9c7686
parent 028bb8ee

src/com/cyanogenmod/trebuchet/Launcher.java

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

                    }

src/com/cyanogenmod/trebuchet/LauncherViewPropertyAnimator.java

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

src/com/cyanogenmod/trebuchet/Workspace.java

+1 −1
Original line number Diff line number Diff line
@@ -4455,7 +4455,7 @@ public class Workspace extends PagedView 
    }



    void moveToDefaultScreen(boolean animate) {

        if (!isSmall()) {

        if (!isSmall() && !mIsSwitchingState) {

            if (animate) {

                snapToPage(mDefaultHomescreen);

            } else {