diff options
author | Michael Jurka <mikejurka@google.com> | 2012-10-25 12:30:05 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-25 12:30:05 -0700 |
commit | 219b556ed0024f7ffed2f19379fb4f060aa96535 (patch) | |
tree | 0357d25f9a7fb82b2909185414b891c97486ba3d /tests | |
parent | ed0aa545dd75f8c4f72fc636f48dc1e5bc3045c8 (diff) | |
parent | 0c7e8aac441c18117b8daf3255d2658b83a37bde (diff) | |
download | android_packages_apps_Gallery2-219b556ed0024f7ffed2f19379fb4f060aa96535.tar.gz android_packages_apps_Gallery2-219b556ed0024f7ffed2f19379fb4f060aa96535.tar.bz2 android_packages_apps_Gallery2-219b556ed0024f7ffed2f19379fb4f060aa96535.zip |
am 0c7e8aac: Merge "Fix build." into gb-ub-photos-arches
* commit '0c7e8aac441c18117b8daf3255d2658b83a37bde':
Fix build.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/src/com/android/gallery3d/ui/GLRootMock.java | 3 | ||||
-rw-r--r-- | tests/src/com/android/gallery3d/ui/GLRootStub.java | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/tests/src/com/android/gallery3d/ui/GLRootMock.java b/tests/src/com/android/gallery3d/ui/GLRootMock.java index b1c4355d0..da78e14ec 100644 --- a/tests/src/com/android/gallery3d/ui/GLRootMock.java +++ b/tests/src/com/android/gallery3d/ui/GLRootMock.java @@ -26,6 +26,9 @@ public class GLRootMock implements GLRoot { public void addOnGLIdleListener(OnGLIdleListener listener) {} public void registerLaunchedAnimation(CanvasAnimation animation) {} + public void requestRenderForced() { + mRequestRenderCalled++; + } public void requestRender() { mRequestRenderCalled++; } diff --git a/tests/src/com/android/gallery3d/ui/GLRootStub.java b/tests/src/com/android/gallery3d/ui/GLRootStub.java index 7f134dbf1..25e7bca5b 100644 --- a/tests/src/com/android/gallery3d/ui/GLRootStub.java +++ b/tests/src/com/android/gallery3d/ui/GLRootStub.java @@ -23,6 +23,7 @@ import com.android.gallery3d.anim.CanvasAnimation; public class GLRootStub implements GLRoot { public void addOnGLIdleListener(OnGLIdleListener listener) {} public void registerLaunchedAnimation(CanvasAnimation animation) {} + public void requestRenderForced() {} public void requestRender() {} public void requestLayoutContentPane() {} public boolean hasStencil() { return true; } |