LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := Camera
-LOCAL_CERTIFICATE := media
+LOCAL_SDK_VERSION := current
LOCAL_PROGUARD_FLAGS := -include $(LOCAL_PATH)/proguard.flags
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.camera"
- android:sharedUserId="android.media">
+ package="com.google.android.camera">
- <original-package android:name="com.android.camera" />
+ <original-package android:name="com.google.android.camera" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-feature android:name="android.hardware.camera" />
<application android:icon="@drawable/ic_launcher_camera"
android:label="@string/camera_label"
android:taskAffinity="">
- <receiver android:name="CameraButtonIntentReceiver">
+ <receiver android:name="com.android.camera.CameraButtonIntentReceiver">
<intent-filter>
<action android:name="android.intent.action.CAMERA_BUTTON"/>
</intent-filter>
</receiver>
- <activity android:name="Camera"
+ <activity android:name="com.android.camera.Camera"
android:configChanges="orientation|keyboardHidden"
android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
android:screenOrientation="landscape"
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
- <activity android:name="VideoCamera"
+ <activity android:name="com.android.camera.VideoCamera"
android:label="@string/video_camera_label"
android:configChanges="orientation|keyboardHidden"
android:icon="@drawable/ic_launcher_video_camera"
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
+ xmlns:camera="http://schemas.android.com/apk/res/com.google.android.camera"
android:id="@+id/control_bar"
android:layout_height="match_parent"
android:layout_width="76dp"
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
+ xmlns:camera="http://schemas.android.com/apk/res/com.google.android.camera"
android:background="@drawable/camera_background"
android:id="@+id/camera"
android:orientation="horizontal"
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
+ xmlns:camera="http://schemas.android.com/apk/res/com.google.android.camera"
android:id="@+id/video_camera"
android:background="@drawable/camera_background"
android:orientation="horizontal"
-->
<PreferenceGroup
- xmlns:camera="http://schemas.android.com/apk/res/com.android.camera" >
+ xmlns:camera="http://schemas.android.com/apk/res/com.google.android.camera" >
<PreferenceGroup
camera:title="@string/pref_camera_settings_category">
<IconListPreference
-->
<PreferenceGroup
- xmlns:camera="http://schemas.android.com/apk/res/com.android.camera" >
+ xmlns:camera="http://schemas.android.com/apk/res/com.google.android.camera" >
<PreferenceGroup
camera:title="@string/pref_camcorder_settings_category">
<ListPreference
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.camera.tests">
+ package="com.google.android.camera.tests">
<application>
<uses-library android:name="android.test.runner" />
</application>
- <instrumentation android:name="CameraLaunchPerformance"
- android:targetPackage="com.android.camera"
+ <instrumentation android:name="com.android.camera.CameraLaunchPerformance"
+ android:targetPackage="com.google.android.camera"
android:label="Camera Launch Performance">
</instrumentation>
<instrumentation android:name="android.test.InstrumentationTestRunner"
- android:targetPackage="com.android.camera"
+ android:targetPackage="com.google.android.camera"
android:label="Tests for Camera application."/>
</manifest>
* Running all tests:
*
* adb shell am instrument -w \
- * com.android.camera.tests/com.android.camera.CameraStressTestRunner
+ * com.google.android.camera.tests/com.android.camera.CameraStressTestRunner
*/
public class StressTests extends TestSuite {
*
* adb shell am instrument \
* -e com.android.camera.power.ImageAndVideoCapture \
- * -w com.android.camera.tests/android.test.InstrumentationTestRunner
+ * -w com.google.android.camera.tests/android.test.InstrumentationTestRunner
*
*/
private static final long WAIT_FOR_STABLE_STATE = 2000; //2 seconds
public ImageAndVideoCapture() {
- super("com.android.camera", Camera.class);
+ super("com.google.android.camera", Camera.class);
}
@Override
try {
// Switch to the video mode
Intent intent = new Intent();
- intent.setClassName("com.android.camera",
+ intent.setClassName("com.google.android.camera",
"com.android.camera.VideoCamera");
getActivity().startActivity(intent);
for (int i = 0; i < TOTAL_NUMBER_OF_VIDEOCAPTURE; i++) {
private long mAvgJpegCallbackToFirstFrameTime;
public CameraLatency() {
- super("com.android.camera", Camera.class);
+ super("com.google.android.camera", Camera.class);
}
@Override
private String TAG = "CameraStartUp";
private static final String CAMERA_TEST_OUTPUT_FILE = "/sdcard/mediaStressOut.txt";
- private static final String CAMERA_PACKAGE_NAME = "com.android.camera";
+ private static final String CAMERA_PACKAGE_NAME = "com.google.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
*
* adb shell am instrument \
* -e class com.android.camera.stress.ImageCapture \
- * -w com.android.camera.tests/com.android.camera.CameraStressTestRunner
+ * -w com.google.android.camera.tests/com.android.camera.CameraStressTestRunner
*
*/
private FileWriter mfstream;
public ImageCapture() {
- super("com.android.camera", Camera.class);
+ super("com.google.android.camera", Camera.class);
}
@Override
mOut.write("loop: ");
// Switch to the video mode
Intent intent = new Intent();
- intent.setClassName("com.android.camera",
+ intent.setClassName("com.google.android.camera",
"com.android.camera.VideoCamera");
getActivity().startActivity(intent);
for (int i = 0; i < TOTAL_NUMBER_OF_VIDEOCAPTURE; i++) {
*
* adb shell am instrument \
* -e class com.android.camera.stress.SwitchPreview \
- * -w com.android.camera.tests/com.android.camera.CameraStressTestRunner
+ * -w com.google.android.camera.tests/com.android.camera.CameraStressTestRunner
*
*/
public class SwitchPreview extends ActivityInstrumentationTestCase2 <VideoCamera>{
private FileWriter mfstream;
public SwitchPreview() {
- super("com.android.camera", VideoCamera.class);
+ super("com.google.android.camera", VideoCamera.class);
}
@Override
for (int i=0; i< TOTAL_NUMBER_OF_SWITCHING; i++) {
Thread.sleep(WAIT_FOR_PREVIEW);
Intent intent = new Intent();
- intent.setClassName("com.android.camera",
+ intent.setClassName("com.google.android.camera",
"com.android.camera.VideoCamera");
getActivity().startActivity(intent);
Thread.sleep(WAIT_FOR_PREVIEW);
- intent.setClassName("com.android.camera",
+ intent.setClassName("com.google.android.camera",
"com.android.camera.Camera");
getActivity().startActivity(intent);
mOut.write(" ," + i);