Update preview as per aspect ratio on back key press.

If user is not in full screen camera preview mode, pressing back
key will take user to full screen preview mode. During this all
views on filstrip are reloaded and shifted to full screen preview.
While reloading preview aspect ratio was not considered so user
could see stretch preview in case of front camera. This change
calls resize of preview as per aspect ratio after reload.

Change-Id: I3dc8db3cc9917f9db33f5101f6c39cf38b950264
CRs-Fixed: 568855

5 files changed, 11 insertions, 2 deletions

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 3106a489c..d6f5139fb 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1211,6 +1211,7 @@ public class CameraActivity extends Activity
     public void onBackPressed() {
         if (!mFilmStripView.inCameraFullscreen()) {
             mFilmStripView.getController().goToFirstItem();
+            mCurrentModule.resizeForPreviewAspectRatio();
         } else if (!mCurrentModule.onBackPressed()) {
             super.onBackPressed();
         }
diff --git a/src/com/android/camera/CameraModule.java b/src/com/android/camera/CameraModule.java
index 55cae9f0c..48d7eec4a 100644
--- a/src/com/android/camera/CameraModule.java
+++ b/src/com/android/camera/CameraModule.java
@@ -66,4 +66,6 @@ public interface CameraModule {
     public void onMediaSaveServiceConnected(MediaSaveService s);
 
     public boolean arePreviewControlsVisible();
+
+    public void resizeForPreviewAspectRatio();
 }
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 31b9e8b26..8637f1399 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -644,7 +644,8 @@ public class PhotoModule
         }
     }
 
-    private void resizeForPreviewAspectRatio() {
+    @Override
+    public void resizeForPreviewAspectRatio() {
         setPreviewFrameLayoutCameraOrientation();
         Size size = mParameters.getPictureSize();
         Log.e(TAG,"Width = "+ size.width+ "Height = "+size.height);
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 36e5862a2..4224204c1 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -790,7 +790,8 @@ public class VideoModule implements CameraModule,
             mUI.cameraOrientationPreviewResize(false);
     }
 
-    private void resizeForPreviewAspectRatio() {
+    @Override
+    public void resizeForPreviewAspectRatio() {
         setPreviewFrameLayoutCameraOrientation();
         mUI.setAspectRatio(
                 (double) mProfile.videoFrameWidth / mProfile.videoFrameHeight);
diff --git a/src/com/android/camera/WideAnglePanoramaModule.java b/src/com/android/camera/WideAnglePanoramaModule.java
index 6f872ea07..3aed56af8 100644
--- a/src/com/android/camera/WideAnglePanoramaModule.java
+++ b/src/com/android/camera/WideAnglePanoramaModule.java
@@ -852,6 +852,10 @@ public class WideAnglePanoramaModule
     }
 
     @Override
+    public void resizeForPreviewAspectRatio() {
+    }
+
+    @Override
     public void onResumeBeforeSuper() {
         mPaused = false;
     }