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

Commit eccdc428 authored by nicolasroard's avatar nicolasroard Committed by Android (Google) Code Review
Browse files

Merge "Fix animation in tablet" into gb-ub-photos-carlsbad

parents 889b1b25 2b9dc6be

src/com/android/gallery3d/filtershow/category/Action.java

+0 −3
Original line number Diff line number Diff line
@@ -104,9 +104,6 @@ public class Action implements RenderingRequestCaller { 
    public void setRepresentation(FilterRepresentation representation) {

        mRepresentation = representation;

        mName = representation.getName();

        if (mRepresentation instanceof FilterDrawRepresentation) {

            setIsDoubleAction(true);

        }

    }



    public String getName() {

src/com/android/gallery3d/filtershow/category/CategoryView.java

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ public class CategoryView extends IconView 
    private int mSpacerColor = Color.WHITE;

    private boolean mCanBeRemoved = false;

    private long mDoubleActionLast = 0;

    private long mDoubleTapDelay = 150;

    private long mDoubleTapDelay = 250;



    public CategoryView(Context context) {

        super(context);

src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java

+12 −1
Original line number Diff line number Diff line
@@ -271,7 +271,18 @@ public abstract class BaseFiltersManager implements FiltersManagerInterface { 
        }



        //mTools.add(getRepresentation(ImageFilterRedEye.class));

        //mTools.add(getRepresentation(ImageFilterDraw.class));

        mTools.add(getRepresentation(ImageFilterDraw.class));

    }



    public void removeRepresentation(ArrayList<FilterRepresentation> list,

                                          FilterRepresentation representation) {

        for (int i = 0; i < list.size(); i++) {

            FilterRepresentation r = list.get(i);

            if (r.getFilterClass() == representation.getFilterClass()) {

                list.remove(i);

                break;

            }

        }

    }



    public void setFilterResources(Resources resources) {

src/com/android/gallery3d/filtershow/imageshow/ImageShow.java

+6 −3
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.graphics.Shader; 
import android.graphics.drawable.NinePatchDrawable;

import android.support.v4.widget.EdgeEffectCompat;

import android.util.AttributeSet;

import android.util.Log;

import android.view.GestureDetector;

import android.view.GestureDetector.OnDoubleTapListener;

import android.view.GestureDetector.OnGestureListener;
@@ -365,8 +366,7 @@ public class ImageShow extends View implements OnGestureListener, 
        m.mapRect(d);

        d.roundOut(mImageBounds);



        if (master.onGoingNewLookAnimation()

                || mDidStartAnimation) {

        if (master.onGoingNewLookAnimation()) {

            mDidStartAnimation = true;

            canvas.save();
@@ -387,8 +387,10 @@ public class ImageShow extends View implements OnGestureListener, 
                if (maskScale >= 0.0f) {

                    float maskW = sMask.getWidth() / 2.0f;

                    float maskH = sMask.getHeight() / 2.0f;



                    Point point = mActivity.hintTouchPoint(this);

                    float maxMaskScale = 2 * Math.max(getWidth(), getHeight())

                            / Math.min(maskW, maskH);

                    maskScale = maskScale * maxMaskScale;

                    float x = point.x - maskW * maskScale;

                    float y = point.y - maskH * maskScale;
@@ -475,6 +477,7 @@ public class ImageShow extends View implements OnGestureListener, 
                && !master.getPreviousPreset().equals(master.getCurrentPreset())) {

            mDidStartAnimation = false;

            MasterImage.getImage().resetAnimBitmap();

            invalidate();

        }



        canvas.restore();

src/com/android/gallery3d/filtershow/imageshow/MasterImage.java

+1 −1
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ public class MasterImage implements RenderingRequestCaller { 
        mPreviousPreset = getPreviewBuffer().getConsumer().getPreset();

        if (newRepresentation instanceof FilterUserPresetRepresentation) {

            mCurrentLookAnimation = CIRCLE_ANIMATION;

            mAnimator = ValueAnimator.ofFloat(0, 40);

            mAnimator = ValueAnimator.ofFloat(0, 1);

            mAnimator.setDuration(650);

        }

        if (newRepresentation instanceof FilterRotateRepresentation) {