From 4a4d4ef24b7edbbdf1614373880681e5406df246 Mon Sep 17 00:00:00 2001
From: Michael Kolb <kolby@google.com>
Date: Thu, 30 May 2013 08:35:26 -0700
Subject: Add HTC One picture resolutions

  Bug: 9175168

Fixes bug where preview is not stopped before size changes

Change-Id: I2df136482df68a952c9d3ca5c058ba56ff3a6db8
---
 src/com/android/camera/PhotoModule.java | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 5b352719f..e88645d27 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1628,6 +1628,8 @@ public class PhotoModule
                     return; // Exiting, so no need to get the surface texture.
                 }
                 mUI.setSurfaceTexture(screenNail.getSurfaceTexture());
+            } else {
+                updatePreviewSize(screenNail);
             }
             mCameraDevice.setDisplayOrientation(mCameraDisplayOrientation);
             Object st = mUI.getSurfaceTexture();
@@ -1649,6 +1651,21 @@ public class PhotoModule
         }
     }
 
+    private void updatePreviewSize(CameraScreenNail snail) {
+        Size size = mParameters.getPreviewSize();
+        int w = size.width;
+        int h = size.height;
+        if (mCameraDisplayOrientation % 180 != 0) {
+            w = size.height;
+            h = size.width;
+        }
+        if (snail.getWidth() != w || snail.getHeight() != h) {
+            snail.setSize(w, h);
+        }
+        snail.enableAspectRatioClamping();
+        mActivity.notifyScreenNailChanged();
+    }
+
     @Override
     public void stopPreview() {
         if (mCameraDevice != null && mCameraState != PREVIEW_STOPPED) {
@@ -1742,10 +1759,14 @@ public class PhotoModule
         Size original = mParameters.getPreviewSize();
         if (!original.equals(optimalSize)) {
             mParameters.setPreviewSize(optimalSize.width, optimalSize.height);
-
             // Zoom related settings will be changed for different preview
             // sizes, so set and read the parameters to get latest values
-            mCameraDevice.setParameters(mParameters);
+            if (mHandler.getLooper() == Looper.myLooper()) {
+                // On UI thread only, not when camera starts up
+                setupPreview();
+            } else {
+                mCameraDevice.setParameters(mParameters);
+            }
             mParameters = mCameraDevice.getParameters();
         }
         Log.v(TAG, "Preview size is " + optimalSize.width + "x" + optimalSize.height);
-- 
cgit v1.2.3