diff options
| -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 b147aa1c1..7a7e04466 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()); |