diff options
| author | xiaoqiny <quic_xiaoqiny@codeaurora.org> | 2014-04-22 14:52:56 +0800 |
|---|---|---|
| committer | emancebo <emancebo@cyngn.com> | 2014-09-04 10:40:20 -0700 |
| commit | 540ee64af3c76989da0d32be632c6bf9e3697697 (patch) | |
| tree | 995e487b6c3cf2e7f1741ec01fe3a7a7e93d497a | |
| parent | ac95683211eceaec9f9c2a6611224f7f518b4fb5 (diff) | |
| download | android_packages_apps_Gallery2-540ee64af3c76989da0d32be632c6bf9e3697697.tar.gz android_packages_apps_Gallery2-540ee64af3c76989da0d32be632c6bf9e3697697.tar.bz2 android_packages_apps_Gallery2-540ee64af3c76989da0d32be632c6bf9e3697697.zip | |
Gallery2: Fix force close issue when trim video
- Only mp4 and 3gp file support trim function
CRs-Fixed: 652838
Change-Id: Ib265b96925b84fab458800fea9901ea928c411bb
| -rw-r--r--[-rwxr-xr-x] | res/values/strings.xml | 1 | ||||
| -rw-r--r--[-rwxr-xr-x] | src/com/android/gallery3d/app/PhotoPage.java | 11 |
2 files changed, 10 insertions, 2 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index ed77dbbe9..d17f4a39b 100755..100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1117,4 +1117,5 @@ CHAR LIMIT = NONE] --> <!-- The title of the audio effects dialog. --> <string name="audio_effects_dialog_title">Snapdragon Audio+</string> + <string name="can_not_trim">Only mp4 and 3gp file can be trimmed</string> </resources> diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index 16f4fa5bb..37a03c984 100755..100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -1069,8 +1069,15 @@ public abstract class PhotoPage extends ActivityState implements Intent intent = new Intent(mActivity, TrimVideo.class); intent.setData(manager.getContentUri(path)); // We need the file path to wrap this into a RandomAccessFile. - intent.putExtra(KEY_MEDIA_ITEM_PATH, current.getFilePath()); - mActivity.startActivityForResult(intent, REQUEST_TRIM); + String str = MediaFile.getMimeTypeForFile(current.getFilePath()); + if ("video/mp4".equals(str) || "video/mpeg4".equals(str) + || "video/3gpp".equals(str) || "video/3gpp2".equals(str)) { + intent.putExtra(KEY_MEDIA_ITEM_PATH, current.getFilePath()); + mActivity.startActivityForResult(intent, REQUEST_TRIM); + } else { + Toast.makeText(mActivity, mActivity.getString(R.string.can_not_trim), + Toast.LENGTH_SHORT).show(); + } return true; } case R.id.action_mute: { |