commit b8c2c78c1371b4561b33f356ae22244282eba275
author Unsuk Jung <unsuk@google.com> Fri Jun 27 09:57:31 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jun 27 09:57:31 2014 +0000
tree e87fe798744ddefa7857e0855742132b31632a3f
parent cd3b72e64f5564984ad3298df34af4ed042ec79a
parent c467ac37f213957acfb1ae1cd8e6335aed7bc6a8

am c467ac37: am 06ff2f72: Merge "Fixes the issue with preview when ratio is 1:1" into jb-dev

* commit 'c467ac37f213957acfb1ae1cd8e6335aed7bc6a8':
  Fixes the issue with preview when ratio is 1:1

apps/CtsVerifier/src/com/android/cts/verifier/camera/formats/CameraFormatsActivity.java

diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/camera/formats/CameraFormatsActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/camera/formats/CameraFormatsActivity.java
index 9989057..bc4e5f0 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/camera/formats/CameraFormatsActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/camera/formats/CameraFormatsActivity.java
@@ -401,9 +401,15 @@
         float widthRatio = mNextPreviewSize.width / (float)mPreviewTexWidth;
         float heightRatio = mNextPreviewSize.height / (float)mPreviewTexHeight;
 
-        transform.setScale(1, heightRatio/widthRatio);
-        transform.postTranslate(0,
+        if (heightRatio < widthRatio) {
+            transform.setScale(1, heightRatio/widthRatio);
+            transform.postTranslate(0,
                 mPreviewTexHeight * (1 - heightRatio/widthRatio)/2);
+        } else {
+            transform.setScale(widthRatio/heightRatio, 1);
+            transform.postTranslate(mPreviewTexWidth * (1 - widthRatio/heightRatio)/2,
+            0);
+        }
 
         mPreviewView.setTransform(transform);
 
@@ -719,4 +725,4 @@
         }
     }
 
-}
\ No newline at end of file
+}