diff options
| author | John Reck <jreck@google.com> | 2013-02-15 16:12:45 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-15 16:12:45 -0800 |
| commit | b388cb3c85a35adad399d1693fa8f7e4440555cd (patch) | |
| tree | 17b50ebabfe2c9c1f7eb5d6bfffc7285bd7abc9a /tests_camera | |
| parent | bbf81d24d19537f33aca9f0bcfc48a0ba7ec9c83 (diff) | |
| parent | 7db6eb02312a4c649d34351d1d78add1d8ec814b (diff) | |
| download | android_packages_apps_Gallery2-b388cb3c85a35adad399d1693fa8f7e4440555cd.tar.gz android_packages_apps_Gallery2-b388cb3c85a35adad399d1693fa8f7e4440555cd.tar.bz2 android_packages_apps_Gallery2-b388cb3c85a35adad399d1693fa8f7e4440555cd.zip | |
am 7db6eb02: Remove more com.android.camera.R
* commit '7db6eb02312a4c649d34351d1d78add1d8ec814b':
Remove more com.android.camera.R
Diffstat (limited to 'tests_camera')
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 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; |