diff options
author | Alan Newberger <alann@google.com> | 2014-09-25 01:10:06 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-25 01:10:06 +0000 |
commit | 92db2cb42b74da6dbf94f79edb2671d517441aeb (patch) | |
tree | 4089f971ede745a991c86cc9987d6c56051814b3 | |
parent | af73f89883e9386cf309c029efba19c82597b136 (diff) | |
parent | 6b2d1e0b660e931c6cbc91a25ec85df070712e65 (diff) | |
download | android_packages_apps_Camera2-92db2cb42b74da6dbf94f79edb2671d517441aeb.tar.gz android_packages_apps_Camera2-92db2cb42b74da6dbf94f79edb2671d517441aeb.tar.bz2 android_packages_apps_Camera2-92db2cb42b74da6dbf94f79edb2671d517441aeb.zip |
am 6b2d1e0b: Merge "Revert temporary session images in filmstrip to RGB_565" into ub-camera-glacier
* commit '6b2d1e0b660e931c6cbc91a25ec85df070712e65':
Revert temporary session images in filmstrip to RGB_565
-rw-r--r-- | src/com/android/camera/data/LocalSessionData.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/camera/data/LocalSessionData.java b/src/com/android/camera/data/LocalSessionData.java index 84efd03da..590c7a9a1 100644 --- a/src/com/android/camera/data/LocalSessionData.java +++ b/src/com/android/camera/data/LocalSessionData.java @@ -22,9 +22,11 @@ import android.net.Uri; import android.os.Bundle; import android.view.View; import android.widget.ImageView; + import com.android.camera.Storage; import com.android.camera2.R; import com.bumptech.glide.Glide; +import com.bumptech.glide.load.DecodeFormat; import java.util.Date; import java.util.concurrent.TimeUnit; @@ -70,6 +72,8 @@ public class LocalSessionData implements LocalData { int currentVersion = Storage.getJpegVersionForSession(mUri); Glide.with(context) .loadFromImage(jpegData, mUri.toString() + currentVersion) + .asBitmap() + .format(DecodeFormat.PREFER_RGB_565) .fitCenter() .into(imageView); |