diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-03-13 12:00:32 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-03-13 12:00:32 -0700 |
| commit | af986037f31c2925c1d2295d16738b9fc9532b83 (patch) | |
| tree | 0c11fd2068311452e8b4df24b01e8f0c7a4b3e33 /src/com/android/camera/PhotoUI.java | |
| parent | e62d49283f4f9c4d8f383dbd5ce880c16e6c454d (diff) | |
| parent | c7bb28eb5f486abeb9115a771cac7f870796230f (diff) | |
| download | android_packages_apps_Snap-af986037f31c2925c1d2295d16738b9fc9532b83.tar.gz android_packages_apps_Snap-af986037f31c2925c1d2295d16738b9fc9532b83.tar.bz2 android_packages_apps_Snap-af986037f31c2925c1d2295d16738b9fc9532b83.zip | |
Merge "SnapdragonCamera: Fix settings menu layout dirction from right to left in RTL mode."
Diffstat (limited to 'src/com/android/camera/PhotoUI.java')
| -rw-r--r-- | src/com/android/camera/PhotoUI.java | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index 5a1efd3e6..3f2000cd9 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -799,15 +799,22 @@ public class PhotoUI implements PieListener, } public void showPopup(ListView popup, int level, boolean animate) { + FrameLayout.LayoutParams params; hideUI(); popup.setVisibility(View.VISIBLE); if (level == 1) { if (mMenuLayout == null) { mMenuLayout = new RotateLayout(mActivity, null); - FrameLayout.LayoutParams params = new FrameLayout.LayoutParams( - CameraActivity.SETTING_LIST_WIDTH_1, LayoutParams.WRAP_CONTENT, - Gravity.LEFT | Gravity.TOP); + if (mRootView.getLayoutDirection() != View.LAYOUT_DIRECTION_RTL) { + params = new FrameLayout.LayoutParams( + CameraActivity.SETTING_LIST_WIDTH_1, LayoutParams.WRAP_CONTENT, + Gravity.LEFT | Gravity.TOP); + } else { + params = new FrameLayout.LayoutParams( + CameraActivity.SETTING_LIST_WIDTH_1, LayoutParams.WRAP_CONTENT, + Gravity.RIGHT | Gravity.TOP); + } mMenuLayout.setLayoutParams(params); ((ViewGroup) mRootView).addView(mMenuLayout); } @@ -819,10 +826,15 @@ public class PhotoUI implements PieListener, mSubMenuLayout = new RotateLayout(mActivity, null); ((ViewGroup) mRootView).addView(mSubMenuLayout); } - FrameLayout.LayoutParams params = new FrameLayout.LayoutParams( - CameraActivity.SETTING_LIST_WIDTH_2, LayoutParams.WRAP_CONTENT, - Gravity.LEFT | Gravity.TOP); - + if (mRootView.getLayoutDirection() != View.LAYOUT_DIRECTION_RTL) { + params = new FrameLayout.LayoutParams( + CameraActivity.SETTING_LIST_WIDTH_2, LayoutParams.WRAP_CONTENT, + Gravity.LEFT | Gravity.TOP); + } else { + params = new FrameLayout.LayoutParams( + CameraActivity.SETTING_LIST_WIDTH_2, LayoutParams.WRAP_CONTENT, + Gravity.RIGHT | Gravity.TOP); + } int screenHeight = (mOrientation == 0 || mOrientation == 180) ? mRootView.getHeight() : mRootView.getWidth(); int height = ((ListSubMenu) popup).getPreCalculatedHeight(); |