diff options
author | Mangesh Ghiware <mghiware@google.com> | 2013-08-23 13:28:21 -0700 |
---|---|---|
committer | Mangesh Ghiware <mghiware@google.com> | 2013-08-26 16:49:45 -0700 |
commit | cd2eeb0efc4370f20e9836e20eb11cb974e3b00d (patch) | |
tree | e8bf0edb59838a99041b1003981977a7a0512400 /src/com/android/camera/data/LocalMediaData.java | |
parent | 3be7f94c1029728a8e236cfcde9c8bce68244095 (diff) | |
download | android_packages_apps_Snap-cd2eeb0efc4370f20e9836e20eb11cb974e3b00d.tar.gz android_packages_apps_Snap-cd2eeb0efc4370f20e9836e20eb11cb974e3b00d.tar.bz2 android_packages_apps_Snap-cd2eeb0efc4370f20e9836e20eb11cb974e3b00d.zip |
Bring back Share to filmstrip
Bug: 10367406
Change-Id: I37834442e3af209fb00b98e6da524263ac8c70f0
Diffstat (limited to 'src/com/android/camera/data/LocalMediaData.java')
-rw-r--r-- | src/com/android/camera/data/LocalMediaData.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/camera/data/LocalMediaData.java b/src/com/android/camera/data/LocalMediaData.java index 1f87b5040..88f127f3e 100644 --- a/src/com/android/camera/data/LocalMediaData.java +++ b/src/com/android/camera/data/LocalMediaData.java @@ -380,8 +380,12 @@ public abstract class LocalMediaData implements LocalData { @Override public int getLocalDataType() { - if (mPanoramaMetadata != null && mPanoramaMetadata.mUsePanoramaViewer) { - return LOCAL_PHOTO_SPHERE; + if (mPanoramaMetadata != null) { + if (mPanoramaMetadata.mIsPanorama360) { + return LOCAL_360_PHOTO_SPHERE; + } else if (mPanoramaMetadata.mUsePanoramaViewer) { + return LOCAL_PHOTO_SPHERE; + } } return LOCAL_IMAGE; } |