commit d6e6533a054ea526021c3331a18f93a618442f13
author Doris Liu <tianliu@google.com> Mon Apr 22 17:13:22 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 22 17:13:22 2013 +0000
tree 5223c40ae73f1ef30a88eda5fb4633b1963b9d76
parent ed689873c9da338859dc8858c08afa4fa31578f2
parent faff668b6f7d0e5d35a65aa926f3af589da6289e

Merge "Fix for camera switcher hard to hit" into gb-ub-photos-bryce

src/com/android/camera/PreviewGestures.java

diff --git a/src/com/android/camera/PreviewGestures.java b/src/com/android/camera/PreviewGestures.java
index b968a02..90ab075 100644
--- a/src/com/android/camera/PreviewGestures.java
+++ b/src/com/android/camera/PreviewGestures.java
@@ -317,6 +317,14 @@
 
     private boolean isInside(MotionEvent evt, View v) {
         v.getLocationInWindow(mLocation);
+        // when view is flipped horizontally
+        if ((int) v.getRotationY() == 180) {
+            mLocation[0] -= v.getWidth();
+        }
+        // when view is flipped vertically
+        if ((int) v.getRotationX() == 180) {
+            mLocation[1] -= v.getHeight();
+        }
         return (v.getVisibility() == View.VISIBLE
                 && evt.getX() >= mLocation[0] && evt.getX() < mLocation[0] + v.getWidth()
                 && evt.getY() >= mLocation[1] && evt.getY() < mLocation[1] + v.getHeight());