diff options
| author | George Mount <mount@google.com> | 2013-01-07 16:17:14 -0800 |
|---|---|---|
| committer | George Mount <mount@google.com> | 2013-01-09 14:06:42 -0800 |
| commit | c8cab06ea9dbf4b1d46203603bfefa0160aa8f62 (patch) | |
| tree | 080dfcaeef03af48c9e5fe1c2716e1e2d7981ff4 /src/com/android/gallery3d/ui | |
| parent | fd091d5c1cbb635f26823efa6295bf0563a2e2a4 (diff) | |
| download | android_packages_apps_Snap-c8cab06ea9dbf4b1d46203603bfefa0160aa8f62.tar.gz android_packages_apps_Snap-c8cab06ea9dbf4b1d46203603bfefa0160aa8f62.tar.bz2 android_packages_apps_Snap-c8cab06ea9dbf4b1d46203603bfefa0160aa8f62.zip | |
Fix slide show animation so that cross fades work.
Bug 7961297
Removed the "Additive" blending, which didn't do anything, even in
OpenGL ES 1.1 implementation. Modified the texturing to
change the color of the pixels based on the supplied alpha
rather than modifying the alpha. This appears to match the
implementation in the OpenGL ES 1.1 pipeline.
Change-Id: I52491af1a8a2d727968e4e805bc4bc61647f5cf2
Diffstat (limited to 'src/com/android/gallery3d/ui')
| -rw-r--r-- | src/com/android/gallery3d/ui/SlideshowView.java | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/com/android/gallery3d/ui/SlideshowView.java b/src/com/android/gallery3d/ui/SlideshowView.java index b215c6661..43784232d 100644 --- a/src/com/android/gallery3d/ui/SlideshowView.java +++ b/src/com/android/gallery3d/ui/SlideshowView.java @@ -23,7 +23,6 @@ import com.android.gallery3d.anim.CanvasAnimation; import com.android.gallery3d.anim.FloatAnimation; import com.android.gallery3d.glrenderer.BitmapTexture; import com.android.gallery3d.glrenderer.GLCanvas; -import com.android.gallery3d.glrenderer.GLCanvas.Blending; import java.util.Random; @@ -94,8 +93,6 @@ public class SlideshowView extends GLView { protected void render(GLCanvas canvas) { long animTime = AnimationTime.get(); boolean requestRender = mTransitionAnimation.calculate(animTime); - canvas.save(GLCanvas.SAVE_FLAG_BLEND); - canvas.setBlending(Blending.Additive); float alpha = mPrevTexture == null ? 1f : mTransitionAnimation.get(); if (mPrevTexture != null && alpha != 1f) { @@ -119,7 +116,6 @@ public class SlideshowView extends GLView { canvas.restore(); } if (requestRender) invalidate(); - canvas.restore(); } private class SlideshowAnimation extends CanvasAnimation { |