diff options
| author | Chih-Chung Chang <chihchung@google.com> | 2010-03-08 15:23:39 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-08 15:23:39 -0800 |
| commit | 0ba78c389e42365278f346202a74894053f97556 (patch) | |
| tree | 1e651983b92a1bcb93bbdee7e35966853238de74 /AndroidManifest.xml | |
| parent | d5be45065c4939d5a12b2294cb83230c1aaa8246 (diff) | |
| parent | f744b3ff623764342719de0af4cc184db9837ea8 (diff) | |
| download | packages_apps_LegacyCamera-0ba78c389e42365278f346202a74894053f97556.zip packages_apps_LegacyCamera-0ba78c389e42365278f346202a74894053f97556.tar.gz packages_apps_LegacyCamera-0ba78c389e42365278f346202a74894053f97556.tar.bz2 | |
Merge "Unbundle: change package name to com.google.android.camera"
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 6051c7e..fa99c8b 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,7 @@ <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" /> @@ -18,12 +17,12 @@ <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" @@ -43,7 +42,7 @@ <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" |