diff options
author | John Reck <jreck@google.com> | 2012-10-15 17:10:37 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-15 17:10:37 -0700 |
commit | e2d056e507c776b4b5dbdb42547ad166669d44f2 (patch) | |
tree | 2d28b35892d4a741bef7d8da99a52a177259ff9b /tests | |
parent | 2d4b782a5e1289e736771cd01566858fd0a20dd1 (diff) | |
parent | 5ca0ae63021d987c777f0221d134ddc4b7247f0e (diff) | |
download | android_packages_apps_Snap-e2d056e507c776b4b5dbdb42547ad166669d44f2.tar.gz android_packages_apps_Snap-e2d056e507c776b4b5dbdb42547ad166669d44f2.tar.bz2 android_packages_apps_Snap-e2d056e507c776b4b5dbdb42547ad166669d44f2.zip |
am a38801ed: Merge "Fix build" into gb-ub-photos-arches
* commit 'a38801edd3a39d888bf36607b567171f8b9527ad':
Fix build
Diffstat (limited to 'tests')
-rw-r--r-- | tests/src/com/android/gallery3d/ui/GLRootMock.java | 2 | ||||
-rw-r--r-- | tests/src/com/android/gallery3d/ui/GLRootStub.java | 2 |
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 467edfc7f..b1c4355d0 100644 --- a/tests/src/com/android/gallery3d/ui/GLRootMock.java +++ b/tests/src/com/android/gallery3d/ui/GLRootMock.java @@ -16,6 +16,7 @@ package com.android.gallery3d.ui; +import android.content.Context; import android.graphics.Matrix; import com.android.gallery3d.anim.CanvasAnimation; @@ -42,4 +43,5 @@ public class GLRootMock implements GLRoot { public void freeze() {} public void unfreeze() {} public void setLightsOutMode(boolean enabled) {} + public Context getContext() { return null; } } diff --git a/tests/src/com/android/gallery3d/ui/GLRootStub.java b/tests/src/com/android/gallery3d/ui/GLRootStub.java index 0f3a00164..7f134dbf1 100644 --- a/tests/src/com/android/gallery3d/ui/GLRootStub.java +++ b/tests/src/com/android/gallery3d/ui/GLRootStub.java @@ -16,6 +16,7 @@ package com.android.gallery3d.ui; +import android.content.Context; import android.graphics.Matrix; import com.android.gallery3d.anim.CanvasAnimation; @@ -35,4 +36,5 @@ public class GLRootStub implements GLRoot { public void freeze() {} public void unfreeze() {} public void setLightsOutMode(boolean enabled) {} + public Context getContext() { return null; } } |