summaryrefslogtreecommitdiffstats
path: root/tests/src/com/android/gallery3d/ui/GLCanvasStub.java
diff options
context:
space:
mode:
authorGeorge Mount <mount@google.com>2013-01-07 14:15:10 -0800
committerGeorge Mount <mount@google.com>2013-01-08 07:54:55 -0800
commite4673b2650ffc642afa872458dbf51e1a24b00c8 (patch)
tree5f4fa356b46935a41c9c9008fa0ef599642625ff /tests/src/com/android/gallery3d/ui/GLCanvasStub.java
parent44333ecb8ebb4ea172a7847731837a88719cea3f (diff)
downloadandroid_packages_apps_Snap-e4673b2650ffc642afa872458dbf51e1a24b00c8.tar.gz
android_packages_apps_Snap-e4673b2650ffc642afa872458dbf51e1a24b00c8.tar.bz2
android_packages_apps_Snap-e4673b2650ffc642afa872458dbf51e1a24b00c8.zip
Instantiate GLCanvas rather than reinitialize current GLCanvas.
GLCanvas was being used as a singleton when it really should allow separate instances for correctness. Change-Id: I650884e843a4a78997b70826f6012ae19b8df549
Diffstat (limited to 'tests/src/com/android/gallery3d/ui/GLCanvasStub.java')
-rw-r--r--tests/src/com/android/gallery3d/ui/GLCanvasStub.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/src/com/android/gallery3d/ui/GLCanvasStub.java b/tests/src/com/android/gallery3d/ui/GLCanvasStub.java
index d6bbc3d23..da4c5c493 100644
--- a/tests/src/com/android/gallery3d/ui/GLCanvasStub.java
+++ b/tests/src/com/android/gallery3d/ui/GLCanvasStub.java
@@ -22,6 +22,7 @@ import android.graphics.RectF;
import com.android.gallery3d.glrenderer.BasicTexture;
import com.android.gallery3d.glrenderer.GLCanvas;
+import com.android.gallery3d.glrenderer.GLId;
import com.android.gallery3d.glrenderer.GLPaint;
import com.android.gallery3d.glrenderer.RawTexture;
@@ -30,7 +31,7 @@ import java.nio.FloatBuffer;
import javax.microedition.khronos.opengles.GL11;
-public class GLCanvasStub extends GLCanvas {
+public class GLCanvasStub implements GLCanvas {
@Override
public void setSize(int width, int height) {}
@Override
@@ -165,12 +166,13 @@ public class GLCanvasStub extends GLCanvas {
public void drawOnlyOutsideStencil(boolean onlyOutside) {
}
@Override
- public void initialize(GL11 gl) {
- }
- @Override
public void recoverFromLightCycle() {
}
@Override
public void getBounds(Rect bounds, int x, int y, int width, int height) {
}
+ @Override
+ public GLId getGLId() {
+ return null;
+ }
}