diff options
| author | Alan Newberger <alann@google.com> | 2014-09-25 18:33:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-25 18:33:37 +0000 |
| commit | f379211cc6ec4ca292d100a53a8e1ea49958fcae (patch) | |
| tree | c4a33fa01c0728c5d54075b0e6ae7c52d65963c7 | |
| parent | fc0e5d895cbad548cb2cb1d874d1c0fed49333c9 (diff) | |
| parent | 47c4474ea9e51a58f2ba1795de90c9aaf135f442 (diff) | |
| download | android_packages_apps_Camera2-f379211cc6ec4ca292d100a53a8e1ea49958fcae.tar.gz android_packages_apps_Camera2-f379211cc6ec4ca292d100a53a8e1ea49958fcae.tar.bz2 android_packages_apps_Camera2-f379211cc6ec4ca292d100a53a8e1ea49958fcae.zip | |
am 47c4474e: Merge "Force filmstrip images to generate in JPEG compression format" into ub-camera-glacier
* commit '47c4474ea9e51a58f2ba1795de90c9aaf135f442':
Force filmstrip images to generate in JPEG compression format
| -rw-r--r-- | src/com/android/camera/data/LocalMediaData.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/com/android/camera/data/LocalMediaData.java b/src/com/android/camera/data/LocalMediaData.java index 708bf53e9..cb5ba41ae 100644 --- a/src/com/android/camera/data/LocalMediaData.java +++ b/src/com/android/camera/data/LocalMediaData.java @@ -73,6 +73,10 @@ public abstract class LocalMediaData implements LocalData { protected final double mLongitude; protected final Bundle mMetaData; + private static final int JPEG_COMPRESS_QUALITY = 90; + private static final BitmapEncoder JPEG_ENCODER = + new BitmapEncoder(Bitmap.CompressFormat.JPEG, JPEG_COMPRESS_QUALITY); + /** * Used for thumbnail loading optimization. True if this data has a * corresponding visible view. @@ -354,9 +358,6 @@ public abstract class LocalMediaData implements LocalData { private static final int mSupportedDataActions = DATA_ACTION_DELETE | DATA_ACTION_EDIT | DATA_ACTION_SHARE; - private static final int JPEG_COMPRESS_QUALITY = 90; - private static final BitmapEncoder JPEG_ENCODER = new BitmapEncoder(null, JPEG_COMPRESS_QUALITY); - /** from MediaStore, can only be 0, 90, 180, 270 */ private final int mOrientation; /** @see #getSignature() */ @@ -802,8 +803,12 @@ public abstract class LocalMediaData implements LocalData { Glide.with(context) .loadFromMediaStore(getUri(), mMimeType, mDateModifiedInSeconds, 0) + .asBitmap() + .encoder(JPEG_ENCODER) .thumbnail(Glide.with(context) .loadFromMediaStore(getUri(), mMimeType, mDateModifiedInSeconds, 0) + .asBitmap() + .encoder(JPEG_ENCODER) .override(MEDIASTORE_THUMB_WIDTH, MEDIASTORE_THUMB_HEIGHT)) .placeholder(placeHolderResourceId) .fitCenter() |