diff options
Diffstat (limited to 'src/com/android/camera/ui/RenderOverlay.java')
-rw-r--r-- | src/com/android/camera/ui/RenderOverlay.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/com/android/camera/ui/RenderOverlay.java b/src/com/android/camera/ui/RenderOverlay.java index 0bda10a23..d82ce18b6 100644 --- a/src/com/android/camera/ui/RenderOverlay.java +++ b/src/com/android/camera/ui/RenderOverlay.java @@ -23,7 +23,7 @@ import android.view.MotionEvent; import android.view.View; import android.widget.FrameLayout; -import com.android.camera.NewPreviewGestures; +import com.android.camera.PreviewGestures; import java.util.ArrayList; import java.util.List; @@ -44,7 +44,7 @@ public class RenderOverlay extends FrameLayout { private RenderView mRenderView; private List<Renderer> mClients; - private NewPreviewGestures mGestures; + private PreviewGestures mGestures; // reverse list of touch clients private List<Renderer> mTouchClients; private int[] mPosition = new int[2]; @@ -59,7 +59,7 @@ public class RenderOverlay extends FrameLayout { setWillNotDraw(false); } - public void setGestures(NewPreviewGestures gestures) { + public void setGestures(PreviewGestures gestures) { mGestures = gestures; } @@ -89,7 +89,10 @@ public class RenderOverlay extends FrameLayout { @Override public boolean dispatchTouchEvent(MotionEvent m) { - if (mGestures != null) mGestures.dispatchTouch(m); + if (mGestures != null) { + if (!mGestures.isEnabled()) return false; + mGestures.dispatchTouch(m); + } return true; } |