summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorChih-Chung Chang <chihchung@google.com>2010-03-08 15:55:13 -0800
committerChih-Chung Chang <chihchung@google.com>2010-03-08 15:56:17 -0800
commite57b61d261f6e8aa502a7da195d5f9192fc55630 (patch)
treee7cd7e626ce4917065e96e7a0868753973add681 /AndroidManifest.xml
parent0ba78c389e42365278f346202a74894053f97556 (diff)
downloadpackages_apps_LegacyCamera-e57b61d261f6e8aa502a7da195d5f9192fc55630.zip
packages_apps_LegacyCamera-e57b61d261f6e8aa502a7da195d5f9192fc55630.tar.gz
packages_apps_LegacyCamera-e57b61d261f6e8aa502a7da195d5f9192fc55630.tar.bz2
Revert "Unbundle: change package name to com.google.android.camera"
This reverts commit 1ace47c7352d65b10361863316b5748b4f3e0689.
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml11
1 files changed, 6 insertions, 5 deletions
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"