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 | 07b70a524d4188120153eee5da31b079ecb135ed (patch) | |
| tree | e150feb1530764dbdc7d2ff2d1b531eb40464f8b | |
| parent | 15aff7c3b27e2938cea3734cb350671386d210c7 (diff) | |
| download | android_packages_apps_Gallery2-07b70a524d4188120153eee5da31b079ecb135ed.tar.gz android_packages_apps_Gallery2-07b70a524d4188120153eee5da31b079ecb135ed.tar.bz2 android_packages_apps_Gallery2-07b70a524d4188120153eee5da31b079ecb135ed.zip | |
Handle 360 panorama specific MIME type.
Bug: 7407448
Change-Id: I939a061e2100c2cdc17279982de98f1d446d8aef
| -rw-r--r-- | AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | src/com/android/gallery3d/app/Gallery.java | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2d8ade784..24a03c9bb 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -125,6 +125,7 @@ <data android:mimeType="image/png" /> <data android:mimeType="image/x-ms-bmp" /> <data android:mimeType="image/vnd.wap.wbmp" /> + <data android:mimeType="application/vnd.google.panorama360+jpg" /> </intent-filter> <intent-filter> <action android:name="com.android.camera.action.REVIEW" /> 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()); |