diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2015-03-14 12:40:52 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-03-14 12:40:52 -0700 |
commit | cdea39230374651e9d849f7604b54ea008844fc5 (patch) | |
tree | 1c12126f0ff65329418c66835c62e16862ca9351 | |
parent | 6e80c408d6cd2dc24cd08af6797c9ca901a6286b (diff) | |
parent | e392949611f9252b6940456cbe3a7791ae5fb7cd (diff) | |
download | android_packages_apps_Snap-cdea39230374651e9d849f7604b54ea008844fc5.tar.gz android_packages_apps_Snap-cdea39230374651e9d849f7604b54ea008844fc5.tar.bz2 android_packages_apps_Snap-cdea39230374651e9d849f7604b54ea008844fc5.zip |
Merge "SnapdragonCamera: Fix settings menu layout dirction from right to left in RTL mode."
-rw-r--r-- | src/com/android/camera/PhotoUI.java | 26 | ||||
-rw-r--r-- | src/com/android/camera/VideoUI.java | 33 |
2 files changed, 42 insertions, 17 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(); 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); } |