diff options
Diffstat (limited to 'src/com/android/camera/CaptureUI.java')
-rw-r--r-- | src/com/android/camera/CaptureUI.java | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java index 1bb20e9f7..1cb7d7510 100644 --- a/src/com/android/camera/CaptureUI.java +++ b/src/com/android/camera/CaptureUI.java @@ -655,9 +655,13 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, } private void showSceneInstructionalDialog(int orientation) { + int layoutId = R.layout.scene_mode_instructional; + if ( orientation == 90 || orientation == 270 ) { + layoutId = R.layout.scene_mode_instructional_landscape; + } LayoutInflater inflater = (LayoutInflater)mActivity.getSystemService(Context.LAYOUT_INFLATER_SERVICE); - View view = inflater.inflate(R.layout.scene_mode_instructional, null); + View view = inflater.inflate(layoutId, null); final int index = mSettingsManager.getValueIndex(SettingsManager.KEY_SCENE_MODE); TextView name = (TextView)view.findViewById(R.id.scene_mode_name); @@ -728,12 +732,9 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, dialogWindow.setGravity(Gravity.CENTER); lp.width = lp.height = dialogSize; dialogWindow.setAttributes(lp); - if ( orientation == 180 ) { - dialogSize -= 40; - RelativeLayout layout = (RelativeLayout)view.findViewById(R.id.mode_layout_rect); - FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(dialogSize, dialogSize); - layout.setLayoutParams(params); - } + RelativeLayout layout = (RelativeLayout)view.findViewById(R.id.mode_layout_rect); + FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(dialogSize, dialogSize); + layout.setLayoutParams(params); } private void showSceneModeLabel() { |