Fix bug 2078592.

This bug is that the touch event location should be traslated to be related
to the "owner view" of the zoom control. However, we didn't do that. So, there
is a shift of the location in the event object.

We tried to detect if user has touched on the zoom buttons and then keep those
on-screen controls (including zoom buttons) shown. Now, we fix this bug by
changing the logic to "if user has touched the screen while those on-screen
controls are visilbe" then we keep those controls on screen.

Change-Id: I3664c47d308a76afc7d8746da8bbbc1f3afbf7ac

1 files changed, 5 insertions, 6 deletions

diff --git a/src/com/android/camera/ViewImage.java b/src/com/android/camera/ViewImage.java
index c2069cd..8338ea9 100644
--- a/src/com/android/camera/ViewImage.java
+++ b/src/com/android/camera/ViewImage.java
@@ -16,10 +16,6 @@
 
 package com.android.camera;
 
-import com.android.camera.gallery.IImage;
-import com.android.camera.gallery.IImageList;
-import com.android.camera.gallery.VideoObject;
-
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -46,6 +42,10 @@ import android.view.animation.AnimationUtils;
 import android.widget.Toast;
 import android.widget.ZoomButtonsController;
 
+import com.android.camera.gallery.IImage;
+import com.android.camera.gallery.IImageList;
+import com.android.camera.gallery.VideoObject;
+
 import java.util.Random;
 
 // This activity can display a whole picture and navigate them in a specific
@@ -227,8 +227,7 @@ public class ViewImage extends Activity implements View.OnClickListener {
     @Override
     public boolean dispatchTouchEvent(MotionEvent m) {
         if (mPaused) return true;
-        if (mZoomButtonsController.isVisible()
-                && mZoomButtonsController.onTouch(null, m)) {
+        if (mZoomButtonsController.isVisible()) {
             scheduleDismissOnScreenControls();
         }
         if (!super.dispatchTouchEvent(m)) {