summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/ui
diff options
context:
space:
mode:
authorLikai Ding <likaid@codeaurora.org>2013-08-13 14:07:48 +0800
committerArne Coucheron <arco68@gmail.com>2018-11-10 23:58:00 +0100
commitca6bc84c5607f8412d8518a5ba6028ee4eeb5dec (patch)
treec510662d2c4687b45d2b1832c063b2b55d8746d4 /src/com/android/gallery3d/ui
parentc5c7b5c1c80f846af041bf94ffb71ecebaea6a35 (diff)
downloadandroid_packages_apps_Gallery2-ca6bc84c5607f8412d8518a5ba6028ee4eeb5dec.tar.gz
android_packages_apps_Gallery2-ca6bc84c5607f8412d8518a5ba6028ee4eeb5dec.tar.bz2
android_packages_apps_Gallery2-ca6bc84c5607f8412d8518a5ba6028ee4eeb5dec.zip
Gallery2: Support GIF animation
This change implements a Java GIF decoder. Change-Id: I227cef76cbacd66b7e87bc59b4f07d518b70a859 Signed-off-by: Xiaojing Zhang <zhangx@codeaurora.org>
Diffstat (limited to 'src/com/android/gallery3d/ui')
-rwxr-xr-xsrc/com/android/gallery3d/ui/PhotoView.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/ui/PhotoView.java b/src/com/android/gallery3d/ui/PhotoView.java
index e3b72eead..246e647b4 100755
--- a/src/com/android/gallery3d/ui/PhotoView.java
+++ b/src/com/android/gallery3d/ui/PhotoView.java
@@ -734,7 +734,7 @@ public class PhotoView extends GLView {
canvas.translate((int) (cx + 0.5f), (int) (cy + 0.5f));
int s = (int) (scale * Math.min(r.width(), r.height()) + 0.5f);
//Full pic locates at index 0 of the array in PhotoDataAdapter
- if (mModel.isVideo(0)) {
+ if (mModel.isVideo(0) || mModel.isGif(0)) {
drawVideoPlayIcon(canvas, s);
}
if (mLoadingState == Model.LOADING_FAIL ) {
@@ -864,7 +864,7 @@ public class PhotoView extends GLView {
invalidate();
}
int s = Math.min(drawW, drawH);
- if (mModel.isVideo(mIndex)) {
+ if (mModel.isVideo(mIndex) || mModel.isGif(mIndex)) {
drawVideoPlayIcon(canvas, s);
}