Merge "SnapdragonCamera: Dialog display incompletely in landscape mode" into camera.lnx.1.0-dev.1.0

1 files changed, 8 insertions, 7 deletions

diff --git a/src/com/android/camera/PanoCaptureUI.java b/src/com/android/camera/PanoCaptureUI.java
index 5e9692908..a25ff9f94 100644
--- a/src/com/android/camera/PanoCaptureUI.java
+++ b/src/com/android/camera/PanoCaptureUI.java
@@ -455,9 +455,13 @@ public class PanoCaptureUI implements
     }
 
     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);
 
         TextView name = (TextView)view.findViewById(R.id.scene_mode_name);
         name.setText(R.string.pref_camera_scenemode_entry_panorama);
@@ -516,11 +520,8 @@ public class PanoCaptureUI implements
         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);
     }
 }