From e57b61d261f6e8aa502a7da195d5f9192fc55630 Mon Sep 17 00:00:00 2001
From: Chih-Chung Chang <chihchung@google.com>
Date: Mon, 8 Mar 2010 15:55:13 -0800
Subject: Revert "Unbundle: change package name to com.google.android.camera"
This reverts commit 1ace47c7352d65b10361863316b5748b4f3e0689.
---
tests/src/com/android/camera/StressTests.java | 2 +-
tests/src/com/android/camera/power/ImageAndVideoCapture.java | 6 +++---
tests/src/com/android/camera/stress/CameraLatency.java | 2 +-
tests/src/com/android/camera/stress/CameraStartUp.java | 2 +-
tests/src/com/android/camera/stress/ImageCapture.java | 6 +++---
tests/src/com/android/camera/stress/SwitchPreview.java | 8 ++++----
6 files changed, 13 insertions(+), 13 deletions(-)
(limited to 'tests/src/com')
diff --git a/tests/src/com/android/camera/StressTests.java b/tests/src/com/android/camera/StressTests.java
index 4f4a375..60120a9 100755
--- a/tests/src/com/android/camera/StressTests.java
+++ b/tests/src/com/android/camera/StressTests.java
@@ -31,7 +31,7 @@ import junit.framework.TestSuite;
* Running all tests:
*
* adb shell am instrument -w \
- * com.google.android.camera.tests/com.android.camera.CameraStressTestRunner
+ * com.android.camera.tests/com.android.camera.CameraStressTestRunner
*/
public class StressTests extends TestSuite {
diff --git a/tests/src/com/android/camera/power/ImageAndVideoCapture.java b/tests/src/com/android/camera/power/ImageAndVideoCapture.java
index 9f9a006..01a6d15 100755
--- a/tests/src/com/android/camera/power/ImageAndVideoCapture.java
+++ b/tests/src/com/android/camera/power/ImageAndVideoCapture.java
@@ -31,7 +31,7 @@ import android.content.Intent;
*
* adb shell am instrument \
* -e com.android.camera.power.ImageAndVideoCapture \
- * -w com.google.android.camera.tests/android.test.InstrumentationTestRunner
+ * -w com.android.camera.tests/android.test.InstrumentationTestRunner
*
*/
@@ -45,7 +45,7 @@ public class ImageAndVideoCapture extends ActivityInstrumentationTestCase2 <Came
private static final long WAIT_FOR_STABLE_STATE = 2000; //2 seconds
public ImageAndVideoCapture() {
- super("com.google.android.camera", Camera.class);
+ super("com.android.camera", Camera.class);
}
@Override
@@ -97,7 +97,7 @@ public class ImageAndVideoCapture extends ActivityInstrumentationTestCase2 <Came
try {
// Switch to the video mode
Intent intent = new Intent();
- intent.setClassName("com.google.android.camera",
+ intent.setClassName("com.android.camera",
"com.android.camera.VideoCamera");
getActivity().startActivity(intent);
for (int i = 0; i < TOTAL_NUMBER_OF_VIDEOCAPTURE; i++) {
diff --git a/tests/src/com/android/camera/stress/CameraLatency.java b/tests/src/com/android/camera/stress/CameraLatency.java
index 550d938..f7684ed 100755
--- a/tests/src/com/android/camera/stress/CameraLatency.java
+++ b/tests/src/com/android/camera/stress/CameraLatency.java
@@ -50,7 +50,7 @@ public class CameraLatency extends ActivityInstrumentationTestCase2 <Camera> {
private long mAvgJpegCallbackToFirstFrameTime;
public CameraLatency() {
- super("com.google.android.camera", Camera.class);
+ super("com.android.camera", Camera.class);
}
@Override
diff --git a/tests/src/com/android/camera/stress/CameraStartUp.java b/tests/src/com/android/camera/stress/CameraStartUp.java
index a07b6ba..d8c785f 100644
--- a/tests/src/com/android/camera/stress/CameraStartUp.java
+++ b/tests/src/com/android/camera/stress/CameraStartUp.java
@@ -19,7 +19,7 @@ public class CameraStartUp extends InstrumentationTestCase {
private String TAG = "CameraStartUp";
private static final String CAMERA_TEST_OUTPUT_FILE = "/sdcard/mediaStressOut.txt";
- private static final String CAMERA_PACKAGE_NAME = "com.google.android.camera";
+ private static final String CAMERA_PACKAGE_NAME = "com.android.camera";
private static final String CAMERA_ACTIVITY_NAME = "com.android.camera.Camera";
private static final String VIDEORECORDER_ACTIVITY_NAME = "com.android.camera.VideoCamera";
private static int WAIT_TIME_FOR_PREVIEW = 1500; //1.5 second
diff --git a/tests/src/com/android/camera/stress/ImageCapture.java b/tests/src/com/android/camera/stress/ImageCapture.java
index ad914da..6978657 100755
--- a/tests/src/com/android/camera/stress/ImageCapture.java
+++ b/tests/src/com/android/camera/stress/ImageCapture.java
@@ -38,7 +38,7 @@ import android.content.Intent;
*
* adb shell am instrument \
* -e class com.android.camera.stress.ImageCapture \
- * -w com.google.android.camera.tests/com.android.camera.CameraStressTestRunner
+ * -w com.android.camera.tests/com.android.camera.CameraStressTestRunner
*
*/
@@ -66,7 +66,7 @@ public class ImageCapture extends ActivityInstrumentationTestCase2 <Camera> {
private FileWriter mfstream;
public ImageCapture() {
- super("com.google.android.camera", Camera.class);
+ super("com.android.camera", Camera.class);
}
@Override
@@ -250,7 +250,7 @@ public class ImageCapture extends ActivityInstrumentationTestCase2 <Camera> {
mOut.write("loop: ");
// Switch to the video mode
Intent intent = new Intent();
- intent.setClassName("com.google.android.camera",
+ intent.setClassName("com.android.camera",
"com.android.camera.VideoCamera");
getActivity().startActivity(intent);
for (int i = 0; i < TOTAL_NUMBER_OF_VIDEOCAPTURE; i++) {
diff --git a/tests/src/com/android/camera/stress/SwitchPreview.java b/tests/src/com/android/camera/stress/SwitchPreview.java
index d269a11..e03a563 100755
--- a/tests/src/com/android/camera/stress/SwitchPreview.java
+++ b/tests/src/com/android/camera/stress/SwitchPreview.java
@@ -33,7 +33,7 @@ import android.util.Log;
*
* adb shell am instrument \
* -e class com.android.camera.stress.SwitchPreview \
- * -w com.google.android.camera.tests/com.android.camera.CameraStressTestRunner
+ * -w com.android.camera.tests/com.android.camera.CameraStressTestRunner
*
*/
public class SwitchPreview extends ActivityInstrumentationTestCase2 <VideoCamera>{
@@ -46,7 +46,7 @@ public class SwitchPreview extends ActivityInstrumentationTestCase2 <VideoCamera
private FileWriter mfstream;
public SwitchPreview() {
- super("com.google.android.camera", VideoCamera.class);
+ super("com.android.camera", VideoCamera.class);
}
@Override
@@ -93,11 +93,11 @@ public class SwitchPreview extends ActivityInstrumentationTestCase2 <VideoCamera
for (int i=0; i< TOTAL_NUMBER_OF_SWITCHING; i++) {
Thread.sleep(WAIT_FOR_PREVIEW);
Intent intent = new Intent();
- intent.setClassName("com.google.android.camera",
+ intent.setClassName("com.android.camera",
"com.android.camera.VideoCamera");
getActivity().startActivity(intent);
Thread.sleep(WAIT_FOR_PREVIEW);
- intent.setClassName("com.google.android.camera",
+ intent.setClassName("com.android.camera",
"com.android.camera.Camera");
getActivity().startActivity(intent);
mOut.write(" ," + i);
--
cgit v1.1