Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5388677d authored by Mangesh Ghiware's avatar Mangesh Ghiware Committed by Android (Google) Code Review
Browse files

Merge "Handle 360 panorama specific MIME type." into gb-ub-photos-arches

parents 4164fabf 07b70a52

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -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" />

src/com/android/gallery3d/app/Gallery.java

+5 −2
Original line number Diff line number Diff line
@@ -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());