diff options
| author | Doris Liu <tianliu@google.com> | 2013-03-06 13:56:53 -0800 |
|---|---|---|
| committer | Doris Liu <tianliu@google.com> | 2013-03-06 13:59:30 -0800 |
| commit | 556713fa25b492b6cba9ed8bf4ea6e2f56298fb5 (patch) | |
| tree | 52aca97e6bb1cbc62859d4ea17f345f07b905db6 /src/com/android/camera/ui | |
| parent | 8cfb75ad0f0c60e5115b1c0feb3d717ab4e4bfee (diff) | |
| download | android_packages_apps_Snap-556713fa25b492b6cba9ed8bf4ea6e2f56298fb5.tar.gz android_packages_apps_Snap-556713fa25b492b6cba9ed8bf4ea6e2f56298fb5.tar.bz2 android_packages_apps_Snap-556713fa25b492b6cba9ed8bf4ea6e2f56298fb5.zip | |
Fix camera switcher mode picker
Bug: 8330008
Change-Id: I08ccd38a6898e88d28214cceb22cee6688ce0b3f
Diffstat (limited to 'src/com/android/camera/ui')
| -rw-r--r-- | src/com/android/camera/ui/CameraSwitcher.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/com/android/camera/ui/CameraSwitcher.java b/src/com/android/camera/ui/CameraSwitcher.java index 326416a97..ce4f85003 100644 --- a/src/com/android/camera/ui/CameraSwitcher.java +++ b/src/com/android/camera/ui/CameraSwitcher.java @@ -173,10 +173,14 @@ public class CameraSwitcher extends RotateImageView public boolean isInsidePopup(MotionEvent evt) { if (!showsPopup()) return false; - return evt.getX() >= mPopup.getLeft() - && evt.getX() < mPopup.getRight() - && evt.getY() >= mPopup.getTop() - && evt.getY() < mPopup.getBottom(); + int topLeft[] = new int[2]; + mPopup.getLocationOnScreen(topLeft); + int left = topLeft[0]; + int top = topLeft[1]; + int bottom = top + mPopup.getHeight(); + int right = left + mPopup.getWidth(); + return evt.getX() >= left && evt.getX() < right + && evt.getY() >= top && evt.getY() < bottom; } private void hidePopup() { |