diff options
Diffstat (limited to 'src/com/android/camera/VideoUI.java')
| -rw-r--r-- | src/com/android/camera/VideoUI.java | 42 |
1 files changed, 17 insertions, 25 deletions
diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java index bbec12cd4..fc4243457 100644 --- a/src/com/android/camera/VideoUI.java +++ b/src/com/android/camera/VideoUI.java @@ -629,13 +629,14 @@ public class VideoUI extends BaseUI implements PieRenderer.PieListener, } public boolean sendTouchToPreviewMenu(MotionEvent ev) { + ev.offsetLocation(-mPreviewMenuLayout.getLeft(), -mPreviewMenuLayout.getTop()); return mPreviewMenuLayout.dispatchTouchEvent(ev); } public boolean sendTouchToMenu(MotionEvent ev) { if (mMenuLayout != null) { - View v = mMenuLayout.getChildAt(0); - return v.dispatchTouchEvent(ev); + ev.offsetLocation(-mMenuLayout.getLeft(), -mMenuLayout.getTop()); + return mMenuLayout.dispatchTouchEvent(ev); } return false; } @@ -663,7 +664,6 @@ public class VideoUI extends BaseUI implements PieRenderer.PieListener, } public void showPopup(ListView popup, int level, boolean animate) { - FrameLayout.LayoutParams layoutParams; hideUI(); popup.setVisibility(View.VISIBLE); @@ -671,16 +671,9 @@ public class VideoUI extends BaseUI implements PieRenderer.PieListener, if (mMenuLayout == null) { mMenuLayout = new RotateLayout(mActivity, null); mMenuLayout.setRootView(mRootView); - 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); + mMenuLayout.setLayoutParams(new FrameLayout.LayoutParams( + CameraActivity.SETTING_LIST_WIDTH_1, LayoutParams.WRAP_CONTENT, + Gravity.START | Gravity.TOP)); mRootView.addView(mMenuLayout); } mMenuLayout.addView(popup, new RotateLayout.LayoutParams( @@ -697,15 +690,6 @@ public class VideoUI extends BaseUI implements PieRenderer.PieListener, mRootView.addView(mSubMenuLayout); } - 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); - } final int containerHeight = mRootView.getClientRectForOrientation(mOrientation).height(); @@ -715,10 +699,14 @@ public class VideoUI extends BaseUI implements PieRenderer.PieListener, y = Math.max(0, containerHeight - height); } - if (mRootView.getLayoutDirection() != View.LAYOUT_DIRECTION_RTL) { - layoutParams.setMargins(CameraActivity.SETTING_LIST_WIDTH_1, y, 0, 0); - } else { + final FrameLayout.LayoutParams layoutParams = new FrameLayout.LayoutParams( + CameraActivity.SETTING_LIST_WIDTH_2, LayoutParams.WRAP_CONTENT, + Gravity.START | Gravity.TOP); + + if (isRtl()) { layoutParams.setMargins(0, y, CameraActivity.SETTING_LIST_WIDTH_1, 0); + } else { + layoutParams.setMargins(CameraActivity.SETTING_LIST_WIDTH_1, y, 0, 0); } mSubMenuLayout.setLayoutParams(layoutParams); @@ -747,6 +735,10 @@ public class VideoUI extends BaseUI implements PieRenderer.PieListener, return mPreviewMenuLayout; } + public boolean isRtl() { + return mRootView.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL; + } + public void showPopup(AbstractSettingPopup popup) { hideUI(); |