diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-07-15 22:10:22 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-07-15 22:10:22 -0700 |
| commit | 6bf12267344e49e0df9eda84fc3a6f8f37c00bee (patch) | |
| tree | 5dee7e0b641a332506a5866b56a9465825e6ce58 | |
| parent | 8c1fa9e0c28dd423dc9cdcda775f53f437e95acd (diff) | |
| parent | 494e1ab448fe15db26ff1544bbdca5132eb9d51c (diff) | |
| download | android_packages_apps_Snap-6bf12267344e49e0df9eda84fc3a6f8f37c00bee.tar.gz android_packages_apps_Snap-6bf12267344e49e0df9eda84fc3a6f8f37c00bee.tar.bz2 android_packages_apps_Snap-6bf12267344e49e0df9eda84fc3a6f8f37c00bee.zip | |
Merge "SnapdragonCamera: Fix display smaller thumbnail on panorama preview"
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index e7f9754ba..d6f5a5801 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -852,6 +852,20 @@ public class CameraActivity extends Activity public CircularDrawable(Bitmap bitmap) { int w = bitmap.getWidth(); int h = bitmap.getHeight(); + int targetSize = getResources().getDimensionPixelSize(R.dimen.capture_size); + if (Math.min(w, h) < targetSize) { + Matrix matrix = new Matrix(); + float scale = 1.0f; + if (w > h) { + scale = (float) targetSize / (float) h; + } else { + scale = (float) targetSize / (float) w; + } + matrix.postScale(scale, scale); + bitmap = Bitmap.createBitmap(bitmap, 0, 0, w, h, matrix, true); + w = (int) (w * scale); + h = (int) (h * scale); + } if (w > h) { mLength = h; bitmap = Bitmap.createBitmap(bitmap, (w - h) / 2, 0, h, h); |