summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlikaid <likaid@codeaurora.org>2015-09-14 09:43:03 +0800
committerDaniel Hillenbrand <codeworkx@cyanogenmod.org>2016-01-08 22:50:27 -0800
commit4877242757ea5ef3ae40760db95f193a44642427 (patch)
treebfe8523ff1f7a9d8d8f87034b3476d97e38516e9
parent72b58b9afb6b2aca15cfeb4142e1644c7b6c9fc7 (diff)
downloadandroid_packages_apps_Snap-4877242757ea5ef3ae40760db95f193a44642427.tar.gz
android_packages_apps_Snap-4877242757ea5ef3ae40760db95f193a44642427.tar.bz2
android_packages_apps_Snap-4877242757ea5ef3ae40760db95f193a44642427.zip
SnapdragonCamera: Fix rtl photo menu touch issue
The touch rect is not correctly checked on RTL mode. Recheck touch rect range on preview menu. Change-Id: I40e980377f1765c9caea397a3be085142dd006ce CRs-Fixed: 904563
-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 332783265..8684dbced 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -507,6 +507,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());