summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorztenghui <ztenghui@google.com>2013-08-19 16:50:46 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-08-19 16:50:46 +0000
commit77505296d5943519b0e449edb364a6ee203496b7 (patch)
treee43d73a0038a8f3e6c81164186b755ae8b5b745c /AndroidManifest.xml
parenta4f38c0f8f70c998391780b672eea5d5e49277c7 (diff)
parentb6b3c8cfefd4225bd9beb99ee871f93839c2e308 (diff)
downloadandroid_packages_apps_Gallery2-77505296d5943519b0e449edb364a6ee203496b7.zip
android_packages_apps_Gallery2-77505296d5943519b0e449edb364a6ee203496b7.tar.gz
android_packages_apps_Gallery2-77505296d5943519b0e449edb364a6ee203496b7.tar.bz2
Merge "Add the intent filter for video trimming." into gb-ub-photos-carlsbad
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml7
1 files changed, 7 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4a5da18..b7a1c4e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -217,6 +217,13 @@
</activity>
<activity android:name="com.android.gallery3d.app.TrimVideo"
android:label="@string/trim_label">
+ <intent-filter android:label="@string/crop_label">
+ <action android:name="com.android.camera.action.TRIM" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <data android:scheme="content" />
+ <data android:scheme="file" />
+ <data android:mimeType="video/*" />
+ </intent-filter>
</activity>
<permission android:name="com.android.gallery3d.filtershow.permission.READ"