diff options
author | Danny Baumann <dannybaumann@web.de> | 2016-04-19 11:28:06 +0200 |
---|---|---|
committer | Danny Baumann <dannybaumann@web.de> | 2016-04-25 10:41:08 +0200 |
commit | 3790102575878c57f1fd47260fa03eaa6ff71798 (patch) | |
tree | 7aa2370edd50b19a41bfd9ecf123ab21e6640294 /src/com/android/camera/ui | |
parent | 1f7404e8d825878afef2b4c38e30470ac95e9ba5 (diff) | |
download | android_packages_apps_Snap-3790102575878c57f1fd47260fa03eaa6ff71798.tar.gz android_packages_apps_Snap-3790102575878c57f1fd47260fa03eaa6ff71798.tar.bz2 android_packages_apps_Snap-3790102575878c57f1fd47260fa03eaa6ff71798.zip |
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
Diffstat (limited to 'src/com/android/camera/ui')
-rw-r--r-- | src/com/android/camera/ui/CameraControls.java | 10 |
1 files changed, 8 insertions, 2 deletions
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(), |