diff options
| author | likaid <likaid@codeaurora.org> | 2015-03-06 14:47:08 +0800 |
|---|---|---|
| committer | likaid <likaid@codeaurora.org> | 2015-03-06 14:47:08 +0800 |
| commit | c7bb28eb5f486abeb9115a771cac7f870796230f (patch) | |
| tree | 2ab2912e204bc0f2e4a8cd78e74e80c7a77f73d2 /src/com/android/camera/VideoUI.java | |
| parent | 2d894ed368689085e89b6f0b79fb355575267e97 (diff) | |
| download | android_packages_apps_Snap-c7bb28eb5f486abeb9115a771cac7f870796230f.tar.gz android_packages_apps_Snap-c7bb28eb5f486abeb9115a771cac7f870796230f.tar.bz2 android_packages_apps_Snap-c7bb28eb5f486abeb9115a771cac7f870796230f.zip | |
SnapdragonCamera: Fix settings menu layout dirction from
right to left in RTL mode.
Use gravity of RIGHT instead of LEFT in RTL mode.
Change-Id: I879fd0351c447b35a5dac7fe14e1698b08883583
CRs-Fixed: 801704
Diffstat (limited to 'src/com/android/camera/VideoUI.java')
| -rw-r--r-- | src/com/android/camera/VideoUI.java | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java index ab3a50a02..cc06e7b79 100644 --- a/src/com/android/camera/VideoUI.java +++ b/src/com/android/camera/VideoUI.java @@ -745,16 +745,23 @@ public class VideoUI implements PieRenderer.PieListener, } public void showPopup(ListView popup, int level, boolean animate) { + FrameLayout.LayoutParams layoutParams; 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); - mMenuLayout.setLayoutParams(params); + if (mRootView.getLayoutDirection() != View.LAYOUT_DIRECTION_RTL) { + layoutParams = new FrameLayout.LayoutParams( + CameraActivity.SETTING_LIST_WIDTH_1, LayoutParams.WRAP_CONTENT, + Gravity.LEFT | Gravity.TOP); + } else { + layoutParams = new FrameLayout.LayoutParams( + CameraActivity.SETTING_LIST_WIDTH_1, LayoutParams.WRAP_CONTENT, + Gravity.RIGHT | Gravity.TOP); + } + mMenuLayout.setLayoutParams(layoutParams); ((ViewGroup) mRootView).addView(mMenuLayout); } mMenuLayout.setOrientation(mOrientation, true); @@ -769,9 +776,15 @@ public class VideoUI implements PieRenderer.PieListener, ((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) { + layoutParams = new FrameLayout.LayoutParams( + CameraActivity.SETTING_LIST_WIDTH_2, LayoutParams.WRAP_CONTENT, + Gravity.LEFT | Gravity.TOP); + } else { + layoutParams = 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(); @@ -780,10 +793,10 @@ public class VideoUI implements PieRenderer.PieListener, int y = Math.max(0, yBase); if (yBase + height > screenHeight) y = Math.max(0, screenHeight - height); - params.setMargins(0, y, 0, 0); - params.setMarginStart(CameraActivity.SETTING_LIST_WIDTH_1); + layoutParams.setMargins(0, y, 0, 0); + layoutParams.setMarginStart(CameraActivity.SETTING_LIST_WIDTH_1); - mSubMenuLayout.setLayoutParams(params); + mSubMenuLayout.setLayoutParams(layoutParams); mSubMenuLayout.addView(popup); mSubMenuLayout.setOrientation(mOrientation, true); } |