diff options
| author | Mangesh Ghiware <mghiware@google.com> | 2012-10-25 17:44:54 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-25 17:44:55 -0700 |
| commit | 5388677d3078f2c218d22465c955e3df6b2ffbed (patch) | |
| tree | 50af8bfbb73d48f76e7a19ca3a30dde8d547dbb7 /src/com | |
| parent | 4164fabf5f9324adde9954130aad13c2f72aa24a (diff) | |
| parent | 07b70a524d4188120153eee5da31b079ecb135ed (diff) | |
| download | android_packages_apps_Gallery2-5388677d3078f2c218d22465c955e3df6b2ffbed.tar.gz android_packages_apps_Gallery2-5388677d3078f2c218d22465c955e3df6b2ffbed.tar.bz2 android_packages_apps_Gallery2-5388677d3078f2c218d22465c955e3df6b2ffbed.zip | |
Merge "Handle 360 panorama specific MIME type." into gb-ub-photos-arches
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/gallery3d/app/Gallery.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/app/Gallery.java b/src/com/android/gallery3d/app/Gallery.java index 6ca4bab2d..78fedd838 100644 --- a/src/com/android/gallery3d/app/Gallery.java +++ b/src/com/android/gallery3d/app/Gallery.java @@ -118,7 +118,10 @@ public final class Gallery extends AbstractGalleryActivity implements OnCancelLi private String getContentType(Intent intent) { String type = intent.getType(); - if (type != null) return type; + if (type != null) { + return GalleryUtils.MIME_TYPE_PANORAMA360.equals(type) + ? MediaItem.MIME_TYPE_JPEG : type; + } Uri uri = intent.getData(); try { @@ -192,7 +195,7 @@ public final class Gallery extends AbstractGalleryActivity implements OnCancelLi startDefaultPage(); } } else { - Path itemPath = dm.findPathByUri(uri, intent.getType()); + Path itemPath = dm.findPathByUri(uri, contentType); Path albumPath = dm.getDefaultSetOf(itemPath); data.putString(PhotoPage.KEY_MEDIA_ITEM_PATH, itemPath.toString()); |