This removes all non-Camera stuff from Camera2.

Note: Camera2 is a clone of Gallery2 right now.
Note 2: I will bring .mk files back later.

Change-Id: Ida958654296f5ebaacb6bb0ff59d52a7c37ce6fc

8 files changed, 0 insertions, 910 deletions

diff --git a/tests/src/com/android/gallery3d/stress/CameraLatency.java b/tests/src/com/android/gallery3d/stress/CameraLatency.java
deleted file mode 100755
index 2cdc2f1b7..000000000
--- a/tests/src/com/android/gallery3d/stress/CameraLatency.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.gallery3d.stress;
-
-import com.android.camera.CameraActivity;
-
-import android.app.Instrumentation;
-import android.os.Environment;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.util.Log;
-import android.view.KeyEvent;
-
-import java.io.BufferedWriter;
-import java.io.FileWriter;
-
-/**
- * Junit / Instrumentation test case for camera test
- *
- */
-
-public class CameraLatency extends ActivityInstrumentationTestCase2 <CameraActivity> {
-    private String TAG = "CameraLatency";
-    private static final int TOTAL_NUMBER_OF_IMAGECAPTURE = 20;
-    private static final long WAIT_FOR_IMAGE_CAPTURE_TO_BE_TAKEN = 4000;
-    private static final String CAMERA_TEST_OUTPUT_FILE =
-            Environment.getExternalStorageDirectory().toString() + "/mediaStressOut.txt";
-
-    private long mTotalAutoFocusTime;
-    private long mTotalShutterLag;
-    private long mTotalShutterToPictureDisplayedTime;
-    private long mTotalPictureDisplayedToJpegCallbackTime;
-    private long mTotalJpegCallbackFinishTime;
-    private long mAvgAutoFocusTime;
-    private long mAvgShutterLag = mTotalShutterLag;
-    private long mAvgShutterToPictureDisplayedTime;
-    private long mAvgPictureDisplayedToJpegCallbackTime;
-    private long mAvgJpegCallbackFinishTime;
-
-    public CameraLatency() {
-        super(CameraActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        getActivity();
-        super.setUp();
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-    }
-
-    public void testImageCapture() {
-        Log.v(TAG, "start testImageCapture test");
-        Instrumentation inst = getInstrumentation();
-        inst.sendKeyDownUpSync(KeyEvent.KEYCODE_DPAD_DOWN);
-        try {
-            for (int i = 0; i < TOTAL_NUMBER_OF_IMAGECAPTURE; i++) {
-                Thread.sleep(WAIT_FOR_IMAGE_CAPTURE_TO_BE_TAKEN);
-                inst.sendKeyDownUpSync(KeyEvent.KEYCODE_DPAD_CENTER);
-                Thread.sleep(WAIT_FOR_IMAGE_CAPTURE_TO_BE_TAKEN);
-                //skip the first measurement
-                if (i != 0) {
-                    CameraActivity c = getActivity();
-
-                    // if any of the latency var accessor methods return -1 then the
-                    // camera is set to a different module other than PhotoModule so
-                    // skip the shot and try again
-                    if (c.getAutoFocusTime() != -1) {
-                        mTotalAutoFocusTime += c.getAutoFocusTime();
-                        mTotalShutterLag += c.getShutterLag();
-                        mTotalShutterToPictureDisplayedTime +=
-                                c.getShutterToPictureDisplayedTime();
-                        mTotalPictureDisplayedToJpegCallbackTime +=
-                                c.getPictureDisplayedToJpegCallbackTime();
-                        mTotalJpegCallbackFinishTime += c.getJpegCallbackFinishTime();
-                    }
-                    else {
-                        i--;
-                        continue;
-                    }
-                }
-            }
-        } catch (Exception e) {
-            Log.v(TAG, "Got exception", e);
-        }
-        //ToDO: yslau
-        //1) Need to get the baseline from the cupcake so that we can add the
-        //failure condition of the camera latency.
-        //2) Only count those number with succesful capture. Set the timer to invalid
-        //before capture and ignore them if the value is invalid
-        int numberofRun = TOTAL_NUMBER_OF_IMAGECAPTURE - 1;
-        mAvgAutoFocusTime = mTotalAutoFocusTime / numberofRun;
-        mAvgShutterLag = mTotalShutterLag / numberofRun;
-        mAvgShutterToPictureDisplayedTime =
-                mTotalShutterToPictureDisplayedTime / numberofRun;
-        mAvgPictureDisplayedToJpegCallbackTime =
-                mTotalPictureDisplayedToJpegCallbackTime / numberofRun;
-        mAvgJpegCallbackFinishTime =
-                mTotalJpegCallbackFinishTime / numberofRun;
-
-        try {
-            FileWriter fstream = null;
-            fstream = new FileWriter(CAMERA_TEST_OUTPUT_FILE, true);
-            BufferedWriter out = new BufferedWriter(fstream);
-            out.write("Camera Latency : \n");
-            out.write("Number of loop: " + TOTAL_NUMBER_OF_IMAGECAPTURE + "\n");
-            out.write("Avg AutoFocus = " + mAvgAutoFocusTime + "\n");
-            out.write("Avg mShutterLag = " + mAvgShutterLag + "\n");
-            out.write("Avg mShutterToPictureDisplayedTime = "
-                    + mAvgShutterToPictureDisplayedTime + "\n");
-            out.write("Avg mPictureDisplayedToJpegCallbackTime = "
-                    + mAvgPictureDisplayedToJpegCallbackTime + "\n");
-            out.write("Avg mJpegCallbackFinishTime = " +
-                    mAvgJpegCallbackFinishTime + "\n");
-            out.close();
-            fstream.close();
-        } catch (Exception e) {
-            fail("Camera Latency write output to file");
-        }
-        Log.v(TAG, "The Image capture wait time = " +
-            WAIT_FOR_IMAGE_CAPTURE_TO_BE_TAKEN);
-        Log.v(TAG, "Avg AutoFocus = " + mAvgAutoFocusTime);
-        Log.v(TAG, "Avg mShutterLag = " + mAvgShutterLag);
-        Log.v(TAG, "Avg mShutterToPictureDisplayedTime = "
-                + mAvgShutterToPictureDisplayedTime);
-        Log.v(TAG, "Avg mPictureDisplayedToJpegCallbackTime = "
-                + mAvgPictureDisplayedToJpegCallbackTime);
-        Log.v(TAG, "Avg mJpegCallbackFinishTime = " + mAvgJpegCallbackFinishTime);
-    }
-}
-
diff --git a/tests/src/com/android/gallery3d/stress/CameraStartUp.java b/tests/src/com/android/gallery3d/stress/CameraStartUp.java
deleted file mode 100644
index 3ca163227..000000000
--- a/tests/src/com/android/gallery3d/stress/CameraStartUp.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.gallery3d.stress;
-
-import com.android.camera.CameraActivity;
-
-import android.app.Activity;
-import android.app.Instrumentation;
-import android.content.Intent;
-import android.os.Environment;
-import android.provider.MediaStore;
-import android.test.InstrumentationTestCase;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.util.Log;
-
-import java.io.FileWriter;
-import java.io.BufferedWriter;
-
-/**
- * Test cases to measure the camera and video recorder startup time.
- */
-public class CameraStartUp extends InstrumentationTestCase {
-
-    private static final int TOTAL_NUMBER_OF_STARTUP = 20;
-
-    private String TAG = "CameraStartUp";
-    private static final String CAMERA_TEST_OUTPUT_FILE =
-            Environment.getExternalStorageDirectory().toString() + "/mediaStressOut.txt";
-    private static int WAIT_TIME_FOR_PREVIEW = 1500; //1.5 second
-
-    private long launchCamera() {
-        long startupTime = 0;
-        try {
-            Intent intent = new Intent(Intent.ACTION_MAIN);
-            intent.setClass(getInstrumentation().getTargetContext(), CameraActivity.class);
-            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            long beforeStart = System.currentTimeMillis();
-            Instrumentation inst = getInstrumentation();
-            Activity cameraActivity = inst.startActivitySync(intent);
-            long cameraStarted = System.currentTimeMillis();
-            Thread.sleep(WAIT_TIME_FOR_PREVIEW);
-            cameraActivity.finish();
-            startupTime = cameraStarted - beforeStart;
-            Thread.sleep(1000);
-            Log.v(TAG, "camera startup time: " + startupTime);
-        } catch (Exception e) {
-            Log.v(TAG, "Got exception", e);
-            fail("Fails to get the output file");
-        }
-        return startupTime;
-    }
-
-    private long launchVideo() {
-        long startupTime = 0;
-
-        try {
-            Intent intent = new Intent(MediaStore.INTENT_ACTION_VIDEO_CAMERA);
-            intent.setClass(getInstrumentation().getTargetContext(), CameraActivity.class);
-            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            long beforeStart = System.currentTimeMillis();
-            Instrumentation inst = getInstrumentation();
-            Activity recorderActivity = inst.startActivitySync(intent);
-            long cameraStarted = System.currentTimeMillis();
-            recorderActivity.finish();
-            startupTime = cameraStarted - beforeStart;
-            Log.v(TAG, "Video Startup Time = " + startupTime);
-            // wait for 1s to make sure it reach a clean stage
-            Thread.sleep(WAIT_TIME_FOR_PREVIEW);
-            Log.v(TAG, "video startup time: " + startupTime);
-        } catch (Exception e) {
-            Log.v(TAG, "Got exception", e);
-            fail("Fails to launch video output file");
-        }
-        return startupTime;
-    }
-
-    private void writeToOutputFile(long totalStartupTime,
-            String individualStartupTime, boolean firstStartUp, String Type) throws Exception {
-        // TODO (yslau) : Need to integrate the output data with central
-        // dashboard
-        try {
-            FileWriter fstream = null;
-            fstream = new FileWriter(CAMERA_TEST_OUTPUT_FILE, true);
-            BufferedWriter out = new BufferedWriter(fstream);
-            if (firstStartUp) {
-                out.write("First " + Type + " Startup: " + totalStartupTime + "\n");
-            } else {
-                long averageStartupTime = totalStartupTime / (TOTAL_NUMBER_OF_STARTUP -1);
-                out.write(Type + "startup time: " + "\n");
-                out.write("Number of loop: " + (TOTAL_NUMBER_OF_STARTUP -1)  + "\n");
-                out.write(individualStartupTime + "\n\n");
-                out.write(Type + " average startup time: " + averageStartupTime + " ms\n\n");
-            }
-            out.close();
-            fstream.close();
-        } catch (Exception e) {
-            fail("Camera write output to file");
-        }
-    }
-
-    public void testLaunchVideo() throws Exception {
-        String individualStartupTime;
-        individualStartupTime = "Individual Video Startup Time = ";
-        long totalStartupTime = 0;
-        long startupTime = 0;
-        for (int i = 0; i < TOTAL_NUMBER_OF_STARTUP; i++) {
-            if (i == 0) {
-                // Capture the first startup time individually
-                long firstStartUpTime = launchVideo();
-                writeToOutputFile(firstStartUpTime, "na", true, "Video");
-            } else {
-                startupTime = launchVideo();
-                totalStartupTime += startupTime;
-                individualStartupTime += startupTime + " ,";
-            }
-        }
-        Log.v(TAG, "totalStartupTime =" + totalStartupTime);
-        writeToOutputFile(totalStartupTime, individualStartupTime, false, "Video");
-    }
-
-    public void testLaunchCamera() throws Exception {
-        String individualStartupTime;
-        individualStartupTime = "Individual Camera Startup Time = ";
-        long totalStartupTime = 0;
-        long startupTime = 0;
-        for (int i = 0; i < TOTAL_NUMBER_OF_STARTUP; i++) {
-            if (i == 0) {
-                // Capture the first startup time individually
-                long firstStartUpTime = launchCamera();
-                writeToOutputFile(firstStartUpTime, "na", true, "Camera");
-            } else {
-                startupTime = launchCamera();
-                totalStartupTime += startupTime;
-                individualStartupTime += startupTime + " ,";
-            }
-        }
-        Log.v(TAG, "totalStartupTime =" + totalStartupTime);
-        writeToOutputFile(totalStartupTime,
-                individualStartupTime, false, "Camera");
-    }
-}
diff --git a/tests/src/com/android/gallery3d/stress/CameraStressTestRunner.java b/tests/src/com/android/gallery3d/stress/CameraStressTestRunner.java
deleted file mode 100755
index d3fb10dad..000000000
--- a/tests/src/com/android/gallery3d/stress/CameraStressTestRunner.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.gallery3d.stress;
-
-import android.os.Bundle;
-import android.test.InstrumentationTestRunner;
-import android.test.InstrumentationTestSuite;
-import junit.framework.TestSuite;
-
-public class CameraStressTestRunner extends InstrumentationTestRunner {
-
-    // Default recorder settings
-    public static int mVideoDuration = 20000; // set default to 20 seconds
-    public static int mVideoIterations = 1; // set default to 1 video
-    public static int mImageIterations = 10; // set default to 10 images
-
-    @Override
-    public TestSuite getAllTests() {
-        TestSuite suite = new InstrumentationTestSuite(this);
-        suite.addTestSuite(ImageCapture.class);
-        suite.addTestSuite(VideoCapture.class);
-        return suite;
-    }
-
-    @Override
-    public ClassLoader getLoader() {
-        return CameraStressTestRunner.class.getClassLoader();
-    }
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        String video_iterations = (String) icicle.get("video_iterations");
-        String image_iterations = (String) icicle.get("image_iterations");
-        String video_duration = (String) icicle.get("video_duration");
-
-        if ( video_iterations != null ) {
-            mVideoIterations = Integer.parseInt(video_iterations);
-        }
-        if ( image_iterations != null) {
-            mImageIterations = Integer.parseInt(image_iterations);
-        }
-        if ( video_duration != null) {
-            mVideoDuration = Integer.parseInt(video_duration);
-        }
-    }
-}
diff --git a/tests/src/com/android/gallery3d/stress/ImageCapture.java b/tests/src/com/android/gallery3d/stress/ImageCapture.java
deleted file mode 100755
index 5a9ee6a6c..000000000
--- a/tests/src/com/android/gallery3d/stress/ImageCapture.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.gallery3d.stress;
-
-import com.android.camera.CameraActivity;
-import com.android.gallery3d.stress.CameraStressTestRunner;
-
-import android.app.Instrumentation;
-import android.content.Intent;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.app.Activity;
-
-/**
- * Junit / Instrumentation test case for camera test
- *
- * Running the test suite:
- *
- * adb shell am instrument \
- *    -e class com.android.camera.stress.ImageCapture \
- *    -w com.google.android.camera.tests/android.test.InstrumentationTestRunner
- *
- */
-
-public class ImageCapture extends ActivityInstrumentationTestCase2 <CameraActivity> {
-    private String TAG = "ImageCapture";
-    private static final long WAIT_FOR_IMAGE_CAPTURE_TO_BE_TAKEN = 1500;   //1.5 sedconds
-    private static final long WAIT_FOR_SWITCH_CAMERA = 3000; //3 seconds
-
-    private TestUtil testUtil = new TestUtil();
-
-    // Private intent extras.
-    private final static String EXTRAS_CAMERA_FACING =
-        "android.intent.extras.CAMERA_FACING";
-
-    public ImageCapture() {
-        super(CameraActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        testUtil.prepareOutputFile();
-        super.setUp();
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        testUtil.closeOutputFile();
-        super.tearDown();
-    }
-
-    public void captureImages(String reportTag, Instrumentation inst) {
-        int total_num_of_images = CameraStressTestRunner.mImageIterations;
-        Log.v(TAG, "no of images = " + total_num_of_images);
-
-        //TODO(yslau): Need to integrate the outoput with the central dashboard,
-        //write to a txt file as a temp solution
-        boolean memoryResult = false;
-        KeyEvent focusEvent = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_FOCUS);
-
-        try {
-            testUtil.writeReportHeader(reportTag, total_num_of_images);
-            for (int i = 0; i < total_num_of_images; i++) {
-                Thread.sleep(WAIT_FOR_IMAGE_CAPTURE_TO_BE_TAKEN);
-                inst.sendKeySync(focusEvent);
-                inst.sendCharacterSync(KeyEvent.KEYCODE_CAMERA);
-                Thread.sleep(WAIT_FOR_IMAGE_CAPTURE_TO_BE_TAKEN);
-                testUtil.writeResult(i);
-            }
-        } catch (Exception e) {
-            Log.v(TAG, "Got exception: " + e.toString());
-            assertTrue("testImageCapture", false);
-        }
-    }
-
-    public void testBackImageCapture() throws Exception {
-        Instrumentation inst = getInstrumentation();
-        Intent intent = new Intent();
-
-        intent.setClass(getInstrumentation().getTargetContext(), CameraActivity.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        intent.putExtra(EXTRAS_CAMERA_FACING,
-                android.hardware.Camera.CameraInfo.CAMERA_FACING_BACK);
-        Activity act = inst.startActivitySync(intent);
-        Thread.sleep(WAIT_FOR_SWITCH_CAMERA);
-        captureImages("Back Camera Image Capture\n", inst);
-        act.finish();
-    }
-
-    public void testFrontImageCapture() throws Exception {
-        Instrumentation inst = getInstrumentation();
-        Intent intent = new Intent();
-
-        intent.setClass(getInstrumentation().getTargetContext(), CameraActivity.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        intent.putExtra(EXTRAS_CAMERA_FACING,
-                android.hardware.Camera.CameraInfo.CAMERA_FACING_FRONT);
-        Activity act = inst.startActivitySync(intent);
-        Thread.sleep(WAIT_FOR_SWITCH_CAMERA);
-        captureImages("Front Camera Image Capture\n", inst);
-        act.finish();
-    }
-}
diff --git a/tests/src/com/android/gallery3d/stress/ShotToShotLatency.java b/tests/src/com/android/gallery3d/stress/ShotToShotLatency.java
deleted file mode 100644
index 0d5749e7d..000000000
--- a/tests/src/com/android/gallery3d/stress/ShotToShotLatency.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.gallery3d.stress;
-
-import android.app.Instrumentation;
-import android.os.Environment;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.util.Log;
-import android.view.KeyEvent;
-import com.android.camera.CameraActivity;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-
-/**
- * Junit / Instrumentation test case for measuring camera shot to shot latency
- */
-public class ShotToShotLatency extends ActivityInstrumentationTestCase2<CameraActivity> {
-    private String TAG = "ShotToShotLatency";
-    private static final int TOTAL_NUMBER_OF_SNAPSHOTS = 250;
-    private static final long SNAPSHOT_WAIT = 1000;
-    private static final String CAMERA_TEST_OUTPUT_FILE =
-            Environment.getExternalStorageDirectory().toString() + "/mediaStressOut.txt";
-    private static final String CAMERA_IMAGE_DIRECTORY =
-            Environment.getExternalStorageDirectory().toString() + "/DCIM/Camera/";
-
-    public ShotToShotLatency() {
-        super(CameraActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        getActivity();
-        super.setUp();
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-    }
-
-    private void cleanupLatencyImages() {
-        try {
-            File sdcard = new File(CAMERA_IMAGE_DIRECTORY);
-            File[] pics = null;
-            FilenameFilter filter = new FilenameFilter() {
-                public boolean accept(File dir, String name) {
-                    return name.endsWith(".jpg");
-                }
-            };
-            pics = sdcard.listFiles(filter);
-            for (File f : pics) {
-                f.delete();
-            }
-        } catch (SecurityException e) {
-            Log.e(TAG, "Security manager access violation: " + e.toString());
-        }
-    }
-
-    private void sleep(long time) {
-        try {
-            Thread.sleep(time);
-        } catch (InterruptedException e) {
-            Log.e(TAG, "Sleep InterruptedException " + e.toString());
-        }
-    }
-
-    public void testShotToShotLatency() {
-        long sigmaOfDiffFromMeanSquared = 0;
-        double mean = 0;
-        double standardDeviation = 0;
-        ArrayList<Long> captureTimes = new ArrayList<Long>();
-        ArrayList<Long> latencyTimes = new ArrayList<Long>();
-
-        Log.v(TAG, "start testShotToShotLatency test");
-        Instrumentation inst = getInstrumentation();
-
-        // Generate data points
-        for (int i = 0; i < TOTAL_NUMBER_OF_SNAPSHOTS; i++) {
-            inst.sendKeyDownUpSync(KeyEvent.KEYCODE_DPAD_CENTER);
-            sleep(SNAPSHOT_WAIT);
-            CameraActivity c = getActivity();
-            if (c.getCaptureStartTime() > 0) {
-                captureTimes.add(c.getCaptureStartTime());
-            }
-        }
-
-        // Calculate latencies
-        for (int j = 1; j < captureTimes.size(); j++) {
-            latencyTimes.add(captureTimes.get(j) - captureTimes.get(j - 1));
-        }
-
-        // Crunch numbers
-        for (long dataPoint : latencyTimes) {
-            mean += (double) dataPoint;
-        }
-        mean /= latencyTimes.size();
-
-        for (long dataPoint : latencyTimes) {
-            sigmaOfDiffFromMeanSquared += (dataPoint - mean) * (dataPoint - mean);
-        }
-        standardDeviation = Math.sqrt(sigmaOfDiffFromMeanSquared / latencyTimes.size());
-
-        // Report statistics
-        File outFile = new File(CAMERA_TEST_OUTPUT_FILE);
-        BufferedWriter output = null;
-        try {
-            output = new BufferedWriter(new FileWriter(outFile, true));
-            output.write("Shot to shot latency - mean: " + mean + "\n");
-            output.write("Shot to shot latency - standard deviation: " + standardDeviation + "\n");
-            cleanupLatencyImages();
-        } catch (IOException e) {
-            Log.e(TAG, "testShotToShotLatency IOException writing to log " + e.toString());
-        } finally {
-            try {
-                if (output != null) {
-                    output.close();
-                }
-            } catch (IOException e) {
-                Log.e(TAG, "Error closing file: " + e.toString());
-            }
-        }
-    }
-}
diff --git a/tests/src/com/android/gallery3d/stress/SwitchPreview.java b/tests/src/com/android/gallery3d/stress/SwitchPreview.java
deleted file mode 100755
index 3545f3b3e..000000000
--- a/tests/src/com/android/gallery3d/stress/SwitchPreview.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.gallery3d.stress;
-
-import com.android.camera.CameraActivity;
-
-import android.app.Instrumentation;
-import android.content.Intent;
-import android.provider.MediaStore;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.os.Environment;
-import android.util.Log;
-
-import java.io.BufferedWriter;
-import java.io.FileWriter;
-
-/**
- * Junit / Instrumentation test case for camera test
- *
- * Running the test suite:
- *
- * adb shell am instrument \
- *    -e class com.android.camera.stress.SwitchPreview \
- *    -w com.android.camera.tests/com.android.camera.stress.CameraStressTestRunner
- *
- */
-public class SwitchPreview extends ActivityInstrumentationTestCase2 <CameraActivity>{
-    private String TAG = "SwitchPreview";
-    private static final int TOTAL_NUMBER_OF_SWITCHING = 200;
-    private static final long WAIT_FOR_PREVIEW = 4000;
-
-    private static final String CAMERA_TEST_OUTPUT_FILE =
-            Environment.getExternalStorageDirectory().toString() + "/mediaStressOut.txt";
-    private BufferedWriter mOut;
-    private FileWriter mfstream;
-
-    public SwitchPreview() {
-        super(CameraActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        getActivity();
-        prepareOutputFile();
-        super.setUp();
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        getActivity().finish();
-        closeOutputFile();
-        super.tearDown();
-    }
-
-    private void prepareOutputFile(){
-        try{
-            mfstream = new FileWriter(CAMERA_TEST_OUTPUT_FILE, true);
-            mOut = new BufferedWriter(mfstream);
-        } catch (Exception e){
-            assertTrue("Camera Switch Mode", false);
-        }
-    }
-
-    private void closeOutputFile() {
-        try {
-            mOut.write("\n");
-            mOut.close();
-            mfstream.close();
-        } catch (Exception e) {
-            assertTrue("CameraSwitchMode close output", false);
-        }
-    }
-
-    public void testSwitchMode() {
-        //Switching the video and the video recorder mode
-        Instrumentation inst = getInstrumentation();
-        try{
-            mOut.write("Camera Switch Mode:\n");
-            mOut.write("No of loops :" + TOTAL_NUMBER_OF_SWITCHING + "\n");
-            mOut.write("loop: ");
-            for (int i=0; i< TOTAL_NUMBER_OF_SWITCHING; i++) {
-                Thread.sleep(WAIT_FOR_PREVIEW);
-                Intent intent = new Intent(MediaStore.INTENT_ACTION_VIDEO_CAMERA);
-                intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                intent.setClass(getInstrumentation().getTargetContext(),
-                        CameraActivity.class);
-                getActivity().startActivity(intent);
-                Thread.sleep(WAIT_FOR_PREVIEW);
-                intent = new Intent();
-                intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                intent.setClass(getInstrumentation().getTargetContext(),
-                        CameraActivity.class);
-                getActivity().startActivity(intent);
-                mOut.write(" ," + i);
-                mOut.flush();
-            }
-        } catch (Exception e){
-            Log.v(TAG, "Got exception", e);
-        }
-    }
-}
diff --git a/tests/src/com/android/gallery3d/stress/TestUtil.java b/tests/src/com/android/gallery3d/stress/TestUtil.java
deleted file mode 100644
index 56ab715f7..000000000
--- a/tests/src/com/android/gallery3d/stress/TestUtil.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.gallery3d.stress;
-
-import android.os.Environment;
-import java.io.FileWriter;
-import java.io.BufferedWriter;
-
-
-/**
- * Collection of utility functions used for the test.
- */
-public class TestUtil {
-    public BufferedWriter mOut;
-    public FileWriter mfstream;
-
-    public TestUtil() {
-    }
-
-    public void prepareOutputFile() throws Exception {
-        String camera_test_output_file =
-                Environment.getExternalStorageDirectory().toString() + "/mediaStressOut.txt";
-        mfstream = new FileWriter(camera_test_output_file, true);
-        mOut = new BufferedWriter(mfstream);
-    }
-
-    public void closeOutputFile() throws Exception {
-        mOut.write("\n");
-        mOut.close();
-        mfstream.close();
-    }
-
-    public void writeReportHeader(String reportTag, int iteration) throws Exception {
-        mOut.write(reportTag);
-        mOut.write("No of loops :" + iteration + "\n");
-        mOut.write("loop: ");
-    }
-
-    public void writeResult(int iteration) throws Exception {
-        mOut.write(" ," + iteration);
-        mOut.flush();
-    }
-}
diff --git a/tests/src/com/android/gallery3d/stress/VideoCapture.java b/tests/src/com/android/gallery3d/stress/VideoCapture.java
deleted file mode 100755
index 8211badf7..000000000
--- a/tests/src/com/android/gallery3d/stress/VideoCapture.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.gallery3d.stress;
-
-import com.android.camera.CameraActivity;
-import com.android.gallery3d.stress.TestUtil;
-
-import android.app.Activity;
-import android.app.Instrumentation;
-import android.content.Intent;
-import android.provider.MediaStore;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.view.KeyEvent;
-
-import com.android.gallery3d.stress.CameraStressTestRunner;
-
-/**
- * Junit / Instrumentation test case for camera test
- *
- * Running the test suite:
- *
- * adb shell am instrument \
- *    -e class com.android.camera.stress.VideoCapture \
- *    -w com.google.android.camera.tests/android.test.InstrumentationTestRunner
- *
- */
-
-public class VideoCapture extends ActivityInstrumentationTestCase2 <CameraActivity> {
-    private static final long WAIT_FOR_PREVIEW = 1500; //1.5 seconds
-    private static final long WAIT_FOR_SWITCH_CAMERA = 3000; //2 seconds
-
-    // Private intent extras which control the camera facing.
-    private final static String EXTRAS_CAMERA_FACING =
-        "android.intent.extras.CAMERA_FACING";
-
-    private TestUtil testUtil = new TestUtil();
-
-    public VideoCapture() {
-        super(CameraActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        testUtil.prepareOutputFile();
-        super.setUp();
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        testUtil.closeOutputFile();
-        super.tearDown();
-    }
-
-    public void captureVideos(String reportTag, Instrumentation inst) throws Exception{
-        boolean memoryResult = false;
-        int total_num_of_videos = CameraStressTestRunner.mVideoIterations;
-        int video_duration = CameraStressTestRunner.mVideoDuration;
-        testUtil.writeReportHeader(reportTag, total_num_of_videos);
-
-        for (int i = 0; i < total_num_of_videos; i++) {
-            Thread.sleep(WAIT_FOR_PREVIEW);
-            // record a video
-            inst.sendCharacterSync(KeyEvent.KEYCODE_CAMERA);
-            Thread.sleep(video_duration);
-            inst.sendCharacterSync(KeyEvent.KEYCODE_CAMERA);
-            testUtil.writeResult(i);
-        }
-    }
-
-    public void testBackVideoCapture() throws Exception {
-        Instrumentation inst = getInstrumentation();
-        Intent intent = new Intent(MediaStore.INTENT_ACTION_VIDEO_CAMERA);
-
-        intent.setClass(getInstrumentation().getTargetContext(), CameraActivity.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        intent.putExtra(EXTRAS_CAMERA_FACING,
-                android.hardware.Camera.CameraInfo.CAMERA_FACING_BACK);
-        Activity act = inst.startActivitySync(intent);
-        Thread.sleep(WAIT_FOR_SWITCH_CAMERA);
-        captureVideos("Back Camera Video Capture\n", inst);
-        act.finish();
-    }
-
-    public void testFrontVideoCapture() throws Exception {
-        Instrumentation inst = getInstrumentation();
-        Intent intent = new Intent(MediaStore.INTENT_ACTION_VIDEO_CAMERA);
-
-        intent.setClass(getInstrumentation().getTargetContext(), CameraActivity.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        intent.putExtra(EXTRAS_CAMERA_FACING,
-                android.hardware.Camera.CameraInfo.CAMERA_FACING_FRONT);
-        Activity act = inst.startActivitySync(intent);
-        Thread.sleep(WAIT_FOR_SWITCH_CAMERA);
-        captureVideos("Front Camera Video Capture\n", inst);
-        act.finish();
-    }
-}