summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoMenu.java
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-09-29 14:42:47 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2015-09-29 14:42:47 -0700
commit5fa760053dcae8e0ebd4cfea45d43e9cb5e6a7ce (patch)
treeb1a04b7ad0e79ab7d373fadd526e90b5aebbe9e9 /src/com/android/camera/PhotoMenu.java
parent85b9592c3a8cc392d80b520b961d368b706bc00e (diff)
parent83a954b1738f306efd5c6e3979d91f16c81c1c4f (diff)
downloadandroid_packages_apps_Snap-5fa760053dcae8e0ebd4cfea45d43e9cb5e6a7ce.tar.gz
android_packages_apps_Snap-5fa760053dcae8e0ebd4cfea45d43e9cb5e6a7ce.tar.bz2
android_packages_apps_Snap-5fa760053dcae8e0ebd4cfea45d43e9cb5e6a7ce.zip
Merge "SnapdragonCamera: Fix rtl photo menu touch issue"
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
-rw-r--r--src/com/android/camera/PhotoMenu.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index b0c975072..bf6e31235 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -568,6 +568,11 @@ public class PhotoMenu extends MenuController
return false;
Rect rec = new Rect();
mUI.getPreviewMenuLayout().getChildAt(0).getHitRect(rec);
+ if (View.LAYOUT_DIRECTION_RTL == TextUtils
+ .getLayoutDirectionFromLocale(Locale.getDefault())) {
+ rec.left = mUI.getRootView().getWidth() - (rec.right-rec.left);
+ rec.right = mUI.getRootView().getWidth();
+ }
rec.top += (int) mUI.getPreviewMenuLayout().getY();
rec.bottom += (int) mUI.getPreviewMenuLayout().getY();
return rec.contains((int) ev.getX(), (int) ev.getY());