SnapdragonCamera: Fix occasional touch AF/AEC detection failure.

1. Fix the issue that during pause/resume, the preview region was
not set properly and focus manager ignore bottom part of preview
region.
2. On device with sensitive touch screen, single tap can be
detected as scroll gesture. Make change to consider scroll
gesture as single tap gesture if it is not the left swipe gesture.

Change-Id: I2139274e60799eac866b8bb70ea66144548b5845
CRs-Fixed: 997843

3 files changed, 2 insertions, 10 deletions

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 589f55152..8e192b543 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -2564,12 +2564,6 @@ public class PhotoModule
         // we will update focus manager with proper UI.
         if (mFocusManager != null && mUI != null) {
             mFocusManager.setPhotoUI(mUI);
-
-            View root = mUI.getRootView();
-            // These depend on camera parameters.
-            int width = root.getWidth();
-            int height = root.getHeight();
-            mFocusManager.setPreviewSize(width, height);
         }
     }
 
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java
index a907140c4..b03ab2420 100644
--- a/src/com/android/camera/PhotoUI.java
+++ b/src/com/android/camera/PhotoUI.java
@@ -478,9 +478,6 @@ public class PhotoUI implements PieListener,
         if (mFaceView != null) {
             mFaceView.setLayoutParams(lp);
         }
-
-        mController.onScreenSizeChanged((int) mSurfaceTextureUncroppedWidth,
-                (int) mSurfaceTextureUncroppedHeight);
     }
 
     public void setSurfaceTextureSizeChangedListener(SurfaceTextureSizeChangedListener listener) {
diff --git a/src/com/android/camera/PreviewGestures.java b/src/com/android/camera/PreviewGestures.java
index 00f7d02b5..4f26240ea 100644
--- a/src/com/android/camera/PreviewGestures.java
+++ b/src/com/android/camera/PreviewGestures.java
@@ -107,8 +107,9 @@ public class PreviewGestures
                 else if (mCaptureMenu != null && !mCaptureMenu.isMenuBeingShown())
                     mCaptureMenu.openFirstLevel();
                 return true;
+            } else {
+                return onSingleTapUp(e2);
             }
-            return false;
         }
 
         private boolean isLeftSwipe(int orientation, int deltaX, int deltaY) {