Choose the preview size that has the same aspect ratio as picture size.

Sometimes the camera driver has many preview sizes with close aspect
ratios. Now camera app only chooses the preview size if its aspect
ratio is an exact match of the picture size or video size.

Change-Id: I3be1189688de3ac499f7d69f4febf09c7763393a

1 files changed, 5 insertions, 3 deletions

diff --git a/src/com/android/camera/Util.java b/src/com/android/camera/Util.java
index 3e5dd77c..f2350d00 100644
--- a/src/com/android/camera/Util.java
+++ b/src/com/android/camera/Util.java
@@ -337,7 +337,8 @@ public class Util {
 
     public static Size getOptimalPreviewSize(Activity currentActivity,
             List<Size> sizes, double targetRatio) {
-        final double ASPECT_TOLERANCE = 0.05;
+        // Use a very small tolerance because we want an exact match.
+        final double ASPECT_TOLERANCE = 0.001;
         if (sizes == null) return null;
 
         Size optimalSize = null;
@@ -367,9 +368,10 @@ public class Util {
             }
         }
 
-        // Cannot find the one match the aspect ratio, ignore the requirement
+        // Cannot find the one match the aspect ratio. This should not happen.
+        // Ignore the requirement.
         if (optimalSize == null) {
-            Log.v(TAG, "No preview size match the aspect ratio");
+            Log.w(TAG, "No preview size match the aspect ratio");
             minDiff = Double.MAX_VALUE;
             for (Size size : sizes) {
                 if (Math.abs(size.height - targetHeight) < minDiff) {