diff options
| author | Doris Liu <tianliu@google.com> | 2012-09-14 18:43:41 -0700 |
|---|---|---|
| committer | Doris Liu <tianliu@google.com> | 2012-09-16 18:43:47 -0700 |
| commit | 1a875b21515baa2f105d9970a3e1d615f771d538 (patch) | |
| tree | eac6e9d6c2e1eac793604a88e5b78f14507a5c02 /AndroidManifest.xml | |
| parent | 093829c3f2f91e6722a4c676ba9e833e2a4e291c (diff) | |
| download | android_packages_apps_Gallery2-1a875b21515baa2f105d9970a3e1d615f771d538.tar.gz android_packages_apps_Gallery2-1a875b21515baa2f105d9970a3e1d615f771d538.tar.bz2 android_packages_apps_Gallery2-1a875b21515baa2f105d9970a3e1d615f771d538.zip | |
Update AndroidManifest for video caputure intent in the new camera
Bug: 7174617
Change-Id: Ib749615fbcb4bc8c882138d29ed234441ca4103e
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 95e2741ef..ab35ad49f 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -274,7 +274,6 @@ </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" @@ -299,6 +298,10 @@ <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> </activity> <!-- Icon sourced from www.raadius.deviantart.com/art/Aeolus-HD-200984118 --> @@ -321,10 +324,6 @@ android:icon="@mipmap/ic_launcher_video_camera" android:clearTaskOnLaunch="true" android:windowSoftInputMode="stateAlwaysHidden|adjustPan"> - <intent-filter> - <action android:name="android.media.action.VIDEO_CAPTURE" /> - <category android:name="android.intent.category.DEFAULT" /> - </intent-filter> </activity> <activity android:name="com.android.camera.PanoramaActivity" android:taskAffinity="com.android.camera" |