diff options
| author | Mangesh Ghiware <mghiware@google.com> | 2012-09-14 12:07:45 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-14 12:07:45 -0700 |
| commit | 9e1cc034ee4f9a694591e6ba2d210bcd3f4ecda2 (patch) | |
| tree | b653e5d1f2bf92a13633f3d0e704040f4a0b5415 /AndroidManifest.xml | |
| parent | 0b0283daab224412f9b3f7d04294ddea83d8f582 (diff) | |
| parent | 0454ddea71cb03db9e72b16024f8a55ed3b88b72 (diff) | |
| download | android_packages_apps_Gallery2-9e1cc034ee4f9a694591e6ba2d210bcd3f4ecda2.tar.gz android_packages_apps_Gallery2-9e1cc034ee4f9a694591e6ba2d210bcd3f4ecda2.tar.bz2 android_packages_apps_Gallery2-9e1cc034ee4f9a694591e6ba2d210bcd3f4ecda2.zip | |
Merge "Update AndroidManifest.xml" into gb-ub-photos-arches
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f29240a8a..4a727b277 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -271,6 +271,17 @@ <action android:name="android.media.action.IMAGE_CAPTURE" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> + </activity> + + <!-- New camera doesn't support the CAPTURE intents yet. --> + <activity android:name="com.android.camera.CameraActivity" + android:taskAffinity="com.google.android.camera" + android:label="@string/camera_label" + android:theme="@style/Theme.Camera" + android:icon="@drawable/ic_switch_camera_holo_light" + android:configChanges="orientation|screenSize|keyboardHidden" + android:clearTaskOnLaunch="true" + android:windowSoftInputMode="stateAlwaysHidden|adjustPan"> <intent-filter> <action android:name="android.media.action.STILL_IMAGE_CAMERA" /> <category android:name="android.intent.category.DEFAULT" /> @@ -279,13 +290,17 @@ <action android:name="android.media.action.STILL_IMAGE_CAMERA_SECURE" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> + <intent-filter> + <action android:name="android.media.action.VIDEO_CAMERA" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> </activity> <!-- Icon sourced from www.raadius.deviantart.com/art/Aeolus-HD-200984118 --> <activity-alias android:icon="@mipmap/ic_launcher_camera" android:label="@string/camera_label" android:name="com.android.camera.CameraLauncher" - android:targetActivity="com.android.camera.Camera" > + android:targetActivity="com.android.camera.CameraActivity" > <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.DEFAULT" /> @@ -293,21 +308,6 @@ </intent-filter> </activity-alias> - <activity android:name="com.android.camera.CameraActivity" - android:taskAffinity="com.google.android.camera" - android:label="@string/camera_label" - android:theme="@style/Theme.Camera" - android:icon="@drawable/ic_switch_camera_holo_light" - android:configChanges="orientation|screenSize|keyboardHidden" - android:clearTaskOnLaunch="true" - android:windowSoftInputMode="stateAlwaysHidden|adjustPan"> - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - <category android:name="android.intent.category.DEFAULT" /> - <category android:name="android.intent.category.LAUNCHER" /> - </intent-filter> - </activity> - <activity android:name="com.android.camera.VideoCamera" android:taskAffinity="com.android.camera" android:label="@string/video_camera_label" @@ -317,10 +317,6 @@ android:clearTaskOnLaunch="true" android:windowSoftInputMode="stateAlwaysHidden|adjustPan"> <intent-filter> - <action android:name="android.media.action.VIDEO_CAMERA" /> - <category android:name="android.intent.category.DEFAULT" /> - </intent-filter> - <intent-filter> <action android:name="android.media.action.VIDEO_CAPTURE" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> |