diff options
| author | Mangesh Ghiware <mghiware@google.com> | 2012-10-10 15:56:29 -0700 |
|---|---|---|
| committer | Mangesh Ghiware <mghiware@google.com> | 2012-10-25 17:29:41 -0700 |
| commit | 5dbcddd9298fc85be0ab178fbb71b97c0495b1bb (patch) | |
| tree | 0e3b92e2c6722024ab91862486c5d4a2c22493aa /src | |
| parent | f6ac061eb455fff6e8d08410f70db2dffbaa9213 (diff) | |
| download | android_packages_apps_Snap-5dbcddd9298fc85be0ab178fbb71b97c0495b1bb.tar.gz android_packages_apps_Snap-5dbcddd9298fc85be0ab178fbb71b97c0495b1bb.tar.bz2 android_packages_apps_Snap-5dbcddd9298fc85be0ab178fbb71b97c0495b1bb.zip | |
Handle 360 panorama specific MIME type.
Bug: 7407448
Change-Id: I939a061e2100c2cdc17279982de98f1d446d8aef
Diffstat (limited to 'src')
| -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()); |