summaryrefslogtreecommitdiffstats
path: root/tests/src
diff options
context:
space:
mode:
authorGeorge Mount <mount@google.com>2013-01-07 16:17:14 -0800
committerGeorge Mount <mount@google.com>2013-01-09 14:06:42 -0800
commitc8cab06ea9dbf4b1d46203603bfefa0160aa8f62 (patch)
tree080dfcaeef03af48c9e5fe1c2716e1e2d7981ff4 /tests/src
parentfd091d5c1cbb635f26823efa6295bf0563a2e2a4 (diff)
downloadandroid_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 'tests/src')
-rw-r--r--tests/src/com/android/gallery3d/ui/GLCanvasStub.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/tests/src/com/android/gallery3d/ui/GLCanvasStub.java b/tests/src/com/android/gallery3d/ui/GLCanvasStub.java
index da4c5c493..d258a77f7 100644
--- a/tests/src/com/android/gallery3d/ui/GLCanvasStub.java
+++ b/tests/src/com/android/gallery3d/ui/GLCanvasStub.java
@@ -148,9 +148,6 @@ public class GLCanvasStub implements GLCanvas {
return 0;
}
@Override
- public void setBlending(Blending blending) {
- }
- @Override
public void enableStencil() {
}
@Override