From 3790102575878c57f1fd47260fa03eaa6ff71798 Mon Sep 17 00:00:00 2001 From: Danny Baumann Date: Tue, 19 Apr 2016 11:28:06 +0200 Subject: Improve RTL layout behaviour. - Swap top menu items order in RTL - Swipe in menu from the right in RTL - Make it possible to select scene/filter items in RTL - Remove/clean up some nonsense code Change-Id: I884a06f5cc6e72a1d2ee19dbdf32ce511c8466ec JIRA:NIGHTLIES-2849 --- src/com/android/camera/ui/CameraControls.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/com/android/camera/ui') diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java index 4a61a7e5b..d7dd713ef 100644 --- a/src/com/android/camera/ui/CameraControls.java +++ b/src/com/android/camera/ui/CameraControls.java @@ -252,8 +252,14 @@ public class CameraControls extends RotatableLayout { int w = r - l; int h = b - t; - asRow(true, w, h, rotation, mMenu,mFrontBackSwitcher, - mFilterModeSwitcher, mSceneModeSwitcher, mHdrSwitcher); + + if (getLayoutDirection() == View.LAYOUT_DIRECTION_RTL) { + asRow(true, w, h, rotation, mHdrSwitcher, mSceneModeSwitcher, + mFilterModeSwitcher, mFrontBackSwitcher, mMenu); + } else { + asRow(true, w, h, rotation, mMenu, mFrontBackSwitcher, + mFilterModeSwitcher, mSceneModeSwitcher, mHdrSwitcher); + } center(mAutoHdrNotice, l, t + mSize, r, t + mSize + mAutoHdrNotice.getMeasuredHeight(), -- cgit v1.2.3