diff options
| author | Chih-Chung Chang <chihchung@google.com> | 2012-03-22 17:42:33 +0800 |
|---|---|---|
| committer | Chih-Chung Chang <chihchung@google.com> | 2012-04-02 11:24:23 +0800 |
| commit | b29a27f475a2c449abdda8d4e03d30914feed8c6 (patch) | |
| tree | 23c4978471d4054bf95c01e3d923d78280d29cda /tests | |
| parent | 79a981552fc364fae8bf62c8811cba05600f6bf5 (diff) | |
| download | android_packages_apps_Gallery2-b29a27f475a2c449abdda8d4e03d30914feed8c6.tar.gz android_packages_apps_Gallery2-b29a27f475a2c449abdda8d4e03d30914feed8c6.tar.bz2 android_packages_apps_Gallery2-b29a27f475a2c449abdda8d4e03d30914feed8c6.zip | |
Use SurfaceTexture to show Camera preview.
Change-Id: I8bf63dfc5b969ecce51841378b093a650b6f91d8
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/src/com/android/gallery3d/ui/GLCanvasStub.java | 2 | ||||
| -rw-r--r-- | tests/src/com/android/gallery3d/ui/TextureTest.java | 10 |
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 70fef1a1c..ee43cb943 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 821d49bb1..be2356c8e 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; } |
