summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Android.mk2
-rw-r--r--AndroidManifest.xml11
-rw-r--r--res/layout/attach_camera_control.xml2
-rw-r--r--res/layout/camera.xml2
-rw-r--r--res/layout/video_camera.xml2
-rw-r--r--res/xml/camera_preferences.xml2
-rw-r--r--res/xml/video_preferences.xml2
-rw-r--r--tests/AndroidManifest.xml8
-rwxr-xr-xtests/src/com/android/camera/StressTests.java2
-rwxr-xr-xtests/src/com/android/camera/power/ImageAndVideoCapture.java6
-rwxr-xr-xtests/src/com/android/camera/stress/CameraLatency.java2
-rw-r--r--tests/src/com/android/camera/stress/CameraStartUp.java2
-rwxr-xr-xtests/src/com/android/camera/stress/ImageCapture.java6
-rwxr-xr-xtests/src/com/android/camera/stress/SwitchPreview.java8
14 files changed, 29 insertions, 28 deletions
diff --git a/Android.mk b/Android.mk
index a536b3d..cbd3249 100644
--- a/Android.mk
+++ b/Android.mk
@@ -6,7 +6,7 @@ LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := Camera
-LOCAL_SDK_VERSION := current
+LOCAL_CERTIFICATE := media
LOCAL_PROGUARD_FLAGS := -include $(LOCAL_PATH)/proguard.flags
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index fa99c8b..6051c7e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,7 +1,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.google.android.camera">
+ package="com.android.camera"
+ android:sharedUserId="android.media">
- <original-package android:name="com.google.android.camera" />
+ <original-package android:name="com.android.camera" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-feature android:name="android.hardware.camera" />
@@ -17,12 +18,12 @@
<application android:icon="@drawable/ic_launcher_camera"
android:label="@string/camera_label"
android:taskAffinity="">
- <receiver android:name="com.android.camera.CameraButtonIntentReceiver">
+ <receiver android:name="CameraButtonIntentReceiver">
<intent-filter>
<action android:name="android.intent.action.CAMERA_BUTTON"/>
</intent-filter>
</receiver>
- <activity android:name="com.android.camera.Camera"
+ <activity android:name="Camera"
android:configChanges="orientation|keyboardHidden"
android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
android:screenOrientation="landscape"
@@ -42,7 +43,7 @@
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
- <activity android:name="com.android.camera.VideoCamera"
+ <activity android:name="VideoCamera"
android:label="@string/video_camera_label"
android:configChanges="orientation|keyboardHidden"
android:icon="@drawable/ic_launcher_video_camera"
diff --git a/res/layout/attach_camera_control.xml b/res/layout/attach_camera_control.xml
index d01b9d3..7653723 100644
--- a/res/layout/attach_camera_control.xml
+++ b/res/layout/attach_camera_control.xml
@@ -15,7 +15,7 @@
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:camera="http://schemas.android.com/apk/res/com.google.android.camera"
+ xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
android:id="@+id/control_bar"
android:layout_height="match_parent"
android:layout_width="76dp"
diff --git a/res/layout/camera.xml b/res/layout/camera.xml
index 46f916c..1a451f4 100644
--- a/res/layout/camera.xml
+++ b/res/layout/camera.xml
@@ -15,7 +15,7 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:camera="http://schemas.android.com/apk/res/com.google.android.camera"
+ xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
android:background="@drawable/camera_background"
android:id="@+id/camera"
android:orientation="horizontal"
diff --git a/res/layout/video_camera.xml b/res/layout/video_camera.xml
index 839472a..780d4f5 100644
--- a/res/layout/video_camera.xml
+++ b/res/layout/video_camera.xml
@@ -15,7 +15,7 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:camera="http://schemas.android.com/apk/res/com.google.android.camera"
+ xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
android:id="@+id/video_camera"
android:background="@drawable/camera_background"
android:orientation="horizontal"
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index 37fc9ff..7bbab46 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -15,7 +15,7 @@
-->
<PreferenceGroup
- xmlns:camera="http://schemas.android.com/apk/res/com.google.android.camera" >
+ xmlns:camera="http://schemas.android.com/apk/res/com.android.camera" >
<PreferenceGroup
camera:title="@string/pref_camera_settings_category">
<IconListPreference
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index 6edfbb8..677a9b9 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -15,7 +15,7 @@
-->
<PreferenceGroup
- xmlns:camera="http://schemas.android.com/apk/res/com.google.android.camera" >
+ xmlns:camera="http://schemas.android.com/apk/res/com.android.camera" >
<PreferenceGroup
camera:title="@string/pref_camcorder_settings_category">
<ListPreference
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 4096b91..dfe7c38 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -15,18 +15,18 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.google.android.camera.tests">
+ package="com.android.camera.tests">
<application>
<uses-library android:name="android.test.runner" />
</application>
- <instrumentation android:name="com.android.camera.CameraLaunchPerformance"
- android:targetPackage="com.google.android.camera"
+ <instrumentation android:name="CameraLaunchPerformance"
+ android:targetPackage="com.android.camera"
android:label="Camera Launch Performance">
</instrumentation>
<instrumentation android:name="android.test.InstrumentationTestRunner"
- android:targetPackage="com.google.android.camera"
+ android:targetPackage="com.android.camera"
android:label="Tests for Camera application."/>
</manifest>
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);
generated by cgit v1.1 at 2024-05-20 01:52:21 +0000