Merge "SnapdragonCamera: Fix black screen on preview when switch photo/video"

1 files changed, 28 insertions, 0 deletions

diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 4332048a1..ad050ae28 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -285,6 +285,15 @@ public class VideoModule implements CameraModule,
         }
         mParameters = mCameraDevice.getParameters();
         mPreviewFocused = arePreviewControlsVisible();
+        mActivity.runOnUiThread(new Runnable() {
+            public void run() {
+                Size size = mParameters.getPreviewSize();
+                SurfaceHolder sh = mUI.getSurfaceHolder();
+                if ( sh != null ){
+                    sh.setFixedSize(size.width-2, size.height-2);
+                }
+            }
+        });
     }
 
     //QCOM data Members Starts here
@@ -1249,6 +1258,15 @@ public class VideoModule implements CameraModule,
                     @Override
                     public void onPreviewFrame(byte[] data, CameraProxy camera) {
                         mUI.hidePreviewCover();
+                        mActivity.runOnUiThread(new Runnable() {
+                            public void run() {
+                                Size size = mParameters.getPreviewSize();
+                                SurfaceHolder sh = mUI.getSurfaceHolder();
+                                if ( sh != null ){
+                                    sh.setFixedSize(size.width+2, size.height+2);
+                                }
+                            }
+                        });
                     }
                 });
             mCameraDevice.startPreview();
@@ -2938,6 +2956,16 @@ public class VideoModule implements CameraModule,
 
         //Display timelapse msg depending upon selection in front/back camera.
         mUI.showTimeLapseUI(mCaptureTimeLapse);
+
+        mActivity.runOnUiThread(new Runnable() {
+            public void run() {
+                Size size = mParameters.getPreviewSize();
+                SurfaceHolder sh = mUI.getSurfaceHolder();
+                if ( sh != null ){
+                    sh.setFixedSize(size.width-2, size.height-2);
+                }
+            }
+        });
     }
 
     // Preview texture has been copied. Now camera can be released and the