summaryrefslogtreecommitdiffstats
path: root/tests/src/com
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2012-10-15 17:10:37 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-15 17:10:37 -0700
commite2d056e507c776b4b5dbdb42547ad166669d44f2 (patch)
tree2d28b35892d4a741bef7d8da99a52a177259ff9b /tests/src/com
parent2d4b782a5e1289e736771cd01566858fd0a20dd1 (diff)
parent5ca0ae63021d987c777f0221d134ddc4b7247f0e (diff)
downloadandroid_packages_apps_Snap-e2d056e507c776b4b5dbdb42547ad166669d44f2.zip
android_packages_apps_Snap-e2d056e507c776b4b5dbdb42547ad166669d44f2.tar.gz
android_packages_apps_Snap-e2d056e507c776b4b5dbdb42547ad166669d44f2.tar.bz2
am a38801ed: Merge "Fix build" into gb-ub-photos-arches
* commit 'a38801edd3a39d888bf36607b567171f8b9527ad': Fix build
Diffstat (limited to 'tests/src/com')
-rw-r--r--tests/src/com/android/gallery3d/ui/GLRootMock.java2
-rw-r--r--tests/src/com/android/gallery3d/ui/GLRootStub.java2
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 467edfc..b1c4355 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 0f3a001..7f134db 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; }
}