diff options
| author | ztenghui <ztenghui@google.com> | 2013-08-19 09:52:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-19 09:52:38 -0700 |
| commit | 45338df171558bfbddfef6d08f87fa98c2f3b3ea (patch) | |
| tree | 85621cab2d1872f9829d348fe3d8e3956bfdaaa9 | |
| parent | 63cc71a312e1b9a990712714dd7643ae44b97f98 (diff) | |
| parent | 77505296d5943519b0e449edb364a6ee203496b7 (diff) | |
| download | android_packages_apps_Gallery2-45338df171558bfbddfef6d08f87fa98c2f3b3ea.tar.gz android_packages_apps_Gallery2-45338df171558bfbddfef6d08f87fa98c2f3b3ea.tar.bz2 android_packages_apps_Gallery2-45338df171558bfbddfef6d08f87fa98c2f3b3ea.zip | |
am 77505296: Merge "Add the intent filter for video trimming." into gb-ub-photos-carlsbad
* commit '77505296d5943519b0e449edb364a6ee203496b7':
Add the intent filter for video trimming.
| -rw-r--r-- | AndroidManifest.xml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 4a5da186a..b7a1c4e93 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" |