From 26ac2619cc54a743aac488a2b348805c155d1a39 Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Fri, 15 Feb 2013 16:08:26 -0800
Subject: Remove more com.android.camera.R

Change-Id: I410baaf4a3f0d824d44ea24435a1716cad3bb966
---
 tests_camera/src/com/android/camera/activity/CameraActivityTest.java    | 2 +-
 tests_camera/src/com/android/camera/activity/CameraTestCase.java        | 2 +-
 .../src/com/android/camera/functional/ImageCaptureIntentTest.java       | 2 +-
 .../src/com/android/camera/functional/VideoCaptureIntentTest.java       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'tests_camera/src')

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;
-- 
cgit v1.2.3