summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorChih-Chung Chang <chihchung@google.com>2012-03-22 17:42:33 +0800
committerChih-Chung Chang <chihchung@google.com>2012-04-02 11:24:23 +0800
commit037e06c5e11ca4a4e40b0741f2d6604b2fd9337a (patch)
tree047235a4ce31aa2c013db38d99056a7196b491e1 /tests
parentb10f96d2141fae10073ec48f25d7b824647f8f31 (diff)
downloadandroid_packages_apps_Snap-037e06c5e11ca4a4e40b0741f2d6604b2fd9337a.zip
android_packages_apps_Snap-037e06c5e11ca4a4e40b0741f2d6604b2fd9337a.tar.gz
android_packages_apps_Snap-037e06c5e11ca4a4e40b0741f2d6604b2fd9337a.tar.bz2
Use SurfaceTexture to show Camera preview.
Change-Id: I8bf63dfc5b969ecce51841378b093a650b6f91d8
Diffstat (limited to 'tests')
-rw-r--r--tests/src/com/android/gallery3d/ui/GLCanvasStub.java2
-rw-r--r--tests/src/com/android/gallery3d/ui/TextureTest.java10
2 files changed, 12 insertions, 0 deletions
diff --git a/tests/src/com/android/gallery3d/ui/GLCanvasStub.java b/tests/src/com/android/gallery3d/ui/GLCanvasStub.java
index 70fef1a..ee43cb9 100644
--- a/tests/src/com/android/gallery3d/ui/GLCanvasStub.java
+++ b/tests/src/com/android/gallery3d/ui/GLCanvasStub.java
@@ -57,6 +57,8 @@ public class GLCanvasStub implements GLCanvas {
public void drawTexture(BasicTexture texture,
int x, int y, int width, int height, float alpha) {}
public void drawTexture(BasicTexture texture, RectF source, RectF target) {}
+ public void drawTexture(BasicTexture texture, float[] mTextureTransform,
+ int x, int y, int w, int h) {}
public void drawMixed(BasicTexture from, BasicTexture to,
float ratio, int x, int y, int w, int h) {}
public void drawMixed(BasicTexture from, int to,
diff --git a/tests/src/com/android/gallery3d/ui/TextureTest.java b/tests/src/com/android/gallery3d/ui/TextureTest.java
index 821d49b..be2356c 100644
--- a/tests/src/com/android/gallery3d/ui/TextureTest.java
+++ b/tests/src/com/android/gallery3d/ui/TextureTest.java
@@ -43,6 +43,11 @@ public class TextureTest extends TestCase {
return true;
}
+ @Override
+ protected int getTarget() {
+ return GL11.GL_TEXTURE_2D;
+ }
+
public boolean isOpaque() {
mOpaqueCalled++;
return true;
@@ -171,6 +176,11 @@ public class TextureTest extends TestCase {
return true;
}
+ @Override
+ protected int getTarget() {
+ return GL11.GL_TEXTURE_2D;
+ }
+
public boolean isOpaque() {
return true;
}