diff options
| author | Chih-Chung Chang <chihchung@google.com> | 2011-11-10 18:01:33 +0800 |
|---|---|---|
| committer | Chih-Chung Chang <chihchung@google.com> | 2011-11-10 18:01:33 +0800 |
| commit | 0358bbb83b717544d1d20f650a6b8be4f6ff2e99 (patch) | |
| tree | c1656a1273e169d0432878e6854de6f3d8e58945 /src | |
| parent | 669f5b8aed366c59c8c062e1049bc287ff73babf (diff) | |
| download | android_packages_apps_Snap-0358bbb83b717544d1d20f650a6b8be4f6ff2e99.tar.gz android_packages_apps_Snap-0358bbb83b717544d1d20f650a6b8be4f6ff2e99.tar.bz2 android_packages_apps_Snap-0358bbb83b717544d1d20f650a6b8be4f6ff2e99.zip | |
Fix 5548567: Don't play video immediately.
Change-Id: I30e9ebf7461e12250e1ef240c157e7f59b1ce2a1
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/app/AlbumPage.java | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java index eecb8e285..dabfb26d8 100644 --- a/src/com/android/gallery3d/app/AlbumPage.java +++ b/src/com/android/gallery3d/app/AlbumPage.java @@ -175,23 +175,16 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster if (mGetContent) { onGetContent(item); } else { - boolean playVideo = - (item.getSupportedOperations() & MediaItem.SUPPORT_PLAY) != 0; - if (playVideo) { - // Play the video. - PhotoPage.playVideo((Activity) mActivity, item.getPlayUri(), item.getName()); - } else { - // Get into the PhotoPage. - Bundle data = new Bundle(); - mAlbumView.savePositions(PositionRepository.getInstance(mActivity)); - data.putInt(PhotoPage.KEY_INDEX_HINT, slotIndex); - data.putString(PhotoPage.KEY_MEDIA_SET_PATH, - mMediaSetPath.toString()); - data.putString(PhotoPage.KEY_MEDIA_ITEM_PATH, - item.getPath().toString()); - mActivity.getStateManager().startStateForResult( - PhotoPage.class, REQUEST_PHOTO, data); - } + // Get into the PhotoPage. + Bundle data = new Bundle(); + mAlbumView.savePositions(PositionRepository.getInstance(mActivity)); + data.putInt(PhotoPage.KEY_INDEX_HINT, slotIndex); + data.putString(PhotoPage.KEY_MEDIA_SET_PATH, + mMediaSetPath.toString()); + data.putString(PhotoPage.KEY_MEDIA_ITEM_PATH, + item.getPath().toString()); + mActivity.getStateManager().startStateForResult( + PhotoPage.class, REQUEST_PHOTO, data); } } else { mSelectionManager.toggle(item.getPath()); |