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

Commit 2208eae6 authored by nicolasroard's avatar nicolasroard Committed by Android Git Automerger
Browse files

am e30a1cc2: Fix show original 

* commit 'e30a1cc2':
  Fix show original
parents 4f05d51f e30a1cc2

src/com/android/gallery3d/filtershow/state/StateView.java

+15 −18
Original line number Diff line number Diff line
@@ -19,11 +19,8 @@ package com.android.gallery3d.filtershow.state; 
import android.content.Context;

import android.content.res.Resources;

import android.graphics.*;

import android.util.AttributeSet;

import android.util.Log;

import android.view.MotionEvent;

import android.view.View;

import android.view.ViewParent;

import android.widget.LinearLayout;

import com.android.gallery3d.R;

import com.android.gallery3d.filtershow.FilterShowActivity;
@@ -293,9 +290,6 @@ public class StateView extends View implements SwipableView { 
        if (event.getActionMasked() == MotionEvent.ACTION_UP) {

            activity.startTouchAnimation(this, event.getX(), event.getY());

        }

        if (mType == BEGIN) {

            return ret;

        }

        if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {

            mStartTouchY = event.getY();

            mStartTouchX = event.getX();
@@ -303,10 +297,12 @@ public class StateView extends View implements SwipableView { 
                MasterImage.getImage().setShowsOriginal(true);

            }

        }

        if (event.getActionMasked() == MotionEvent.ACTION_UP) {

        if (event.getActionMasked() == MotionEvent.ACTION_UP

            || event.getActionMasked() == MotionEvent.ACTION_CANCEL) {

            setTranslationX(0);

            setTranslationY(0);

            MasterImage.getImage().setShowsOriginal(false);

            if (mType != BEGIN && event.getActionMasked() == MotionEvent.ACTION_UP) {

                setSelected(true);

                FilterRepresentation representation = getState().getFilterRepresentation();

                MasterImage image = MasterImage.getImage();
@@ -319,7 +315,8 @@ public class StateView extends View implements SwipableView { 
                    setSelected(false);

                }

            }

        if (event.getActionMasked() == MotionEvent.ACTION_MOVE) {

        }

        if (mType != BEGIN && event.getActionMasked() == MotionEvent.ACTION_MOVE) {

            float delta = event.getY() - mStartTouchY;

            if (Math.abs(delta) > mDeleteSlope) {

                activity.setHandlesSwipeForView(this, mStartTouchX, mStartTouchY);