summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2012-10-15 17:09:04 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-15 17:09:05 -0700
commit5ca0ae63021d987c777f0221d134ddc4b7247f0e (patch)
tree02747b899a5b3ac41ea12b50311e2b17e1a97521 /tests
parent2ef2d71edf822f0462fb312342f89f80ff271564 (diff)
parent778aebdeedfe0a0d6938c50aeb06d7fac5f1d424 (diff)
downloadandroid_packages_apps_Snap-5ca0ae63021d987c777f0221d134ddc4b7247f0e.zip
android_packages_apps_Snap-5ca0ae63021d987c777f0221d134ddc4b7247f0e.tar.gz
android_packages_apps_Snap-5ca0ae63021d987c777f0221d134ddc4b7247f0e.tar.bz2
Merge "Fix build" into gb-ub-photos-arches
Diffstat (limited to 'tests')
-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; }
}