summaryrefslogtreecommitdiffstats
path: root/tests_camera
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2013-02-15 16:08:26 -0800
committerJohn Reck <jreck@google.com>2013-02-15 16:09:45 -0800
commit26ac2619cc54a743aac488a2b348805c155d1a39 (patch)
tree424514f1a0d4353e558ba61b44773992352298f6 /tests_camera
parentad16c6799d559d304bb8688e37a02d2d9bc53a42 (diff)
downloadandroid_packages_apps_Snap-26ac2619cc54a743aac488a2b348805c155d1a39.zip
android_packages_apps_Snap-26ac2619cc54a743aac488a2b348805c155d1a39.tar.gz
android_packages_apps_Snap-26ac2619cc54a743aac488a2b348805c155d1a39.tar.bz2
Remove more com.android.camera.R
Change-Id: I410baaf4a3f0d824d44ea24435a1716cad3bb966
Diffstat (limited to 'tests_camera')
-rw-r--r--tests_camera/src/com/android/camera/activity/CameraActivityTest.java2
-rw-r--r--tests_camera/src/com/android/camera/activity/CameraTestCase.java2
-rw-r--r--tests_camera/src/com/android/camera/functional/ImageCaptureIntentTest.java2
-rw-r--r--tests_camera/src/com/android/camera/functional/VideoCaptureIntentTest.java2
4 files changed, 4 insertions, 4 deletions
diff --git a/tests_camera/src/com/android/camera/activity/CameraActivityTest.java b/tests_camera/src/com/android/camera/activity/CameraActivityTest.java
index cc8ed83..eb027e9 100644
--- a/tests_camera/src/com/android/camera/activity/CameraActivityTest.java
+++ b/tests_camera/src/com/android/camera/activity/CameraActivityTest.java
@@ -21,7 +21,7 @@ import android.test.suitebuilder.annotation.LargeTest;
import com.android.camera.CameraActivity;
import com.android.camera.CameraHolder;
-import com.android.camera.R;
+import com.android.gallery3d.R;
import static com.google.testing.littlemock.LittleMock.doReturn;
diff --git a/tests_camera/src/com/android/camera/activity/CameraTestCase.java b/tests_camera/src/com/android/camera/activity/CameraTestCase.java
index 7c7c38d..27be3c7 100644
--- a/tests_camera/src/com/android/camera/activity/CameraTestCase.java
+++ b/tests_camera/src/com/android/camera/activity/CameraTestCase.java
@@ -31,8 +31,8 @@ import android.view.View;
import com.android.camera.CameraHolder;
import com.android.camera.CameraManager.CameraProxy;
-import com.android.camera.R;
import com.android.camera.Util;
+import com.android.gallery3d.R;
import static com.google.testing.littlemock.LittleMock.mock;
import static com.google.testing.littlemock.LittleMock.doAnswer;
diff --git a/tests_camera/src/com/android/camera/functional/ImageCaptureIntentTest.java b/tests_camera/src/com/android/camera/functional/ImageCaptureIntentTest.java
index 620ff50..54ac1b4 100644
--- a/tests_camera/src/com/android/camera/functional/ImageCaptureIntentTest.java
+++ b/tests_camera/src/com/android/camera/functional/ImageCaptureIntentTest.java
@@ -17,7 +17,7 @@
package com.android.camera.functional;
import com.android.camera.CameraActivity;
-import com.android.camera.R;
+import com.android.gallery3d.R;
import android.app.Activity;
import android.content.Intent;
diff --git a/tests_camera/src/com/android/camera/functional/VideoCaptureIntentTest.java b/tests_camera/src/com/android/camera/functional/VideoCaptureIntentTest.java
index 292543c..43e91ca 100644
--- a/tests_camera/src/com/android/camera/functional/VideoCaptureIntentTest.java
+++ b/tests_camera/src/com/android/camera/functional/VideoCaptureIntentTest.java
@@ -17,7 +17,7 @@
package com.android.camera.functional;
import com.android.camera.CameraActivity;
-import com.android.camera.R;
+import com.android.gallery3d.R;
import android.app.Activity;
import android.content.ContentResolver;