summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOwen Lin <owenlin@google.com>2012-08-13 20:49:31 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-13 20:49:33 -0700
commit861fcb65a1f37d9d327585d6e1a5a0e395b60217 (patch)
treeeed824c4e0034077b369d41a479cf1ef5a536c4c
parentbb99150a872a7265e44ae5bd9eb3ce3534ac12b3 (diff)
parent1a6969b26ce90b6acfb4af8aba2f4f8f208e2e57 (diff)
downloadandroid_packages_apps_Snap-861fcb65a1f37d9d327585d6e1a5a0e395b60217.tar.gz
android_packages_apps_Snap-861fcb65a1f37d9d327585d6e1a5a0e395b60217.tar.bz2
android_packages_apps_Snap-861fcb65a1f37d9d327585d6e1a5a0e395b60217.zip
Merge "Extract EXIF info only for JPEG files" into gb-ub-photos-arches
-rw-r--r--src/com/android/gallery3d/data/LocalImage.java6
-rw-r--r--src/com/android/gallery3d/data/LocalMediaItem.java2
-rw-r--r--src/com/android/gallery3d/ui/PopupList.java2
3 files changed, 7 insertions, 3 deletions
diff --git a/src/com/android/gallery3d/data/LocalImage.java b/src/com/android/gallery3d/data/LocalImage.java
index 370ef2686..b10b96289 100644
--- a/src/com/android/gallery3d/data/LocalImage.java
+++ b/src/com/android/gallery3d/data/LocalImage.java
@@ -309,7 +309,11 @@ public class LocalImage extends LocalMediaItem {
public MediaDetails getDetails() {
MediaDetails details = super.getDetails();
details.addDetail(MediaDetails.INDEX_ORIENTATION, Integer.valueOf(rotation));
- MediaDetails.extractExifInfo(details, filePath);
+ if (MIME_TYPE_JPEG.equals(mimeType)) {
+ // ExifInterface returns incorrect values for photos in other format.
+ // For example, the width and height of an webp images is always '0'.
+ MediaDetails.extractExifInfo(details, filePath);
+ }
return details;
}
diff --git a/src/com/android/gallery3d/data/LocalMediaItem.java b/src/com/android/gallery3d/data/LocalMediaItem.java
index fdc973e8d..eb054d03e 100644
--- a/src/com/android/gallery3d/data/LocalMediaItem.java
+++ b/src/com/android/gallery3d/data/LocalMediaItem.java
@@ -86,6 +86,8 @@ public abstract class LocalMediaItem extends MediaItem {
details.addDetail(MediaDetails.INDEX_TITLE, caption);
DateFormat formater = DateFormat.getDateTimeInstance();
details.addDetail(MediaDetails.INDEX_DATETIME, formater.format(new Date(dateTakenInMs)));
+ details.addDetail(MediaDetails.INDEX_WIDTH, width);
+ details.addDetail(MediaDetails.INDEX_HEIGHT, height);
if (GalleryUtils.isValidLocation(latitude, longitude)) {
details.addDetail(MediaDetails.INDEX_LOCATION, new double[] {latitude, longitude});
diff --git a/src/com/android/gallery3d/ui/PopupList.java b/src/com/android/gallery3d/ui/PopupList.java
index ee02029c7..a5fbb09a8 100644
--- a/src/com/android/gallery3d/ui/PopupList.java
+++ b/src/com/android/gallery3d/ui/PopupList.java
@@ -18,7 +18,6 @@ import android.widget.PopupWindow;
import android.widget.TextView;
import com.android.gallery3d.R;
-import com.android.gallery3d.common.Utils;
import java.util.ArrayList;
@@ -86,7 +85,6 @@ public class PopupList {
new OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
- Utils.debug("onItemClick: %s, %s", position, id);
if (mPopupWindow == null) return;
mPopupWindow.dismiss();
if (mOnPopupItemClickListener != null) {