diff options
| author | Doris Liu <tianliu@google.com> | 2013-11-06 02:04:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-06 02:04:38 +0000 |
| commit | d1b4ab3e3899ed4ee1d5c90f124db0a6748cc3a4 (patch) | |
| tree | 479b9e4a75bf1ef1d4a6d48d906e487828f14f3b /src | |
| parent | bf4ce93c84400357a28f78a76df62b550e7f85d1 (diff) | |
| parent | 95405749e5a96ff680b9bcafbfe2bab33c16e1ee (diff) | |
| download | android_packages_apps_Snap-d1b4ab3e3899ed4ee1d5c90f124db0a6748cc3a4.tar.gz android_packages_apps_Snap-d1b4ab3e3899ed4ee1d5c90f124db0a6748cc3a4.tar.bz2 android_packages_apps_Snap-d1b4ab3e3899ed4ee1d5c90f124db0a6748cc3a4.zip | |
Merge "Make sure preview aspect ratio is updated" into gb-ub-photos-carlsbad
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index ed13aa57b..b74dd10f6 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1602,10 +1602,6 @@ public class PhotoModule Size original = mParameters.getPreviewSize(); if (!original.equals(optimalSize)) { mParameters.setPreviewSize(optimalSize.width, optimalSize.height); - if(optimalSize.width != 0 && optimalSize.height != 0) { - mUI.updatePreviewAspectRatio((float) optimalSize.width - / (float) optimalSize.height); - } // Zoom related settings will be changed for different preview // sizes, so set and read the parameters to get latest values @@ -1617,6 +1613,11 @@ public class PhotoModule } mParameters = mCameraDevice.getParameters(); } + + if(optimalSize.width != 0 && optimalSize.height != 0) { + mUI.updatePreviewAspectRatio((float) optimalSize.width + / (float) optimalSize.height); + } Log.v(TAG, "Preview size is " + optimalSize.width + "x" + optimalSize.height); // Since changing scene mode may change supported values, set scene mode |