summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/src/com/android/gallery3d/functional/ImageCaptureIntentTest.java2
-rw-r--r--tests/src/com/android/gallery3d/functional/VideoCaptureIntentTest.java2
-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
6 files changed, 6 insertions, 6 deletions
diff --git a/tests/src/com/android/gallery3d/functional/ImageCaptureIntentTest.java b/tests/src/com/android/gallery3d/functional/ImageCaptureIntentTest.java
index c2eeabcce..8d394b5db 100644
--- a/tests/src/com/android/gallery3d/functional/ImageCaptureIntentTest.java
+++ b/tests/src/com/android/gallery3d/functional/ImageCaptureIntentTest.java
@@ -17,7 +17,7 @@
package com.android.gallery3d.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/src/com/android/gallery3d/functional/VideoCaptureIntentTest.java b/tests/src/com/android/gallery3d/functional/VideoCaptureIntentTest.java
index 3802060e2..c8d7bbb1c 100644
--- a/tests/src/com/android/gallery3d/functional/VideoCaptureIntentTest.java
+++ b/tests/src/com/android/gallery3d/functional/VideoCaptureIntentTest.java
@@ -17,7 +17,7 @@
package com.android.gallery3d.functional;
import com.android.camera.CameraActivity;
-import com.android.camera.R;
+import com.android.gallery3d.R;
import android.app.Activity;
import android.content.ContentResolver;
diff --git a/tests_camera/src/com/android/camera/activity/CameraActivityTest.java b/tests_camera/src/com/android/camera/activity/CameraActivityTest.java
index cc8ed83c3..eb027e9d3 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 7c7c38daf..27be3c7d3 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 620ff50b0..54ac1b497 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 292543ccf..43e91ca84 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;