diff options
author | Flamefire <alex@grundis.de> | 2014-09-17 02:40:04 +0200 |
---|---|---|
committer | Arne Coucheron <arco68@gmail.com> | 2017-12-16 06:51:42 +0100 |
commit | 4f26a40d60f036f0d10cb07e0c229dc6e8177204 (patch) | |
tree | 2b91d0a140dfaa3788d65038ce8a57c0ee37ad5a /gallerycommon | |
parent | 269085e79c88ad7cb868a8eae8f74089645dd7d7 (diff) | |
download | android_packages_apps_Gallery2-4f26a40d60f036f0d10cb07e0c229dc6e8177204.tar.gz android_packages_apps_Gallery2-4f26a40d60f036f0d10cb07e0c229dc6e8177204.tar.bz2 android_packages_apps_Gallery2-4f26a40d60f036f0d10cb07e0c229dc6e8177204.zip |
Gallery2: Add record time to details view
Change-Id: Idef3a68699fc25898f9408b64afc6a7c6b45a86e
Diffstat (limited to 'gallerycommon')
-rw-r--r-- | gallerycommon/src/com/android/gallery3d/exif/ExifInterface.java | 18 | ||||
-rw-r--r-- | gallerycommon/src/com/android/gallery3d/exif/ExifTag.java | 10 |
2 files changed, 13 insertions, 15 deletions
diff --git a/gallerycommon/src/com/android/gallery3d/exif/ExifInterface.java b/gallerycommon/src/com/android/gallery3d/exif/ExifInterface.java index 87db689e8..21422095e 100644 --- a/gallerycommon/src/com/android/gallery3d/exif/ExifInterface.java +++ b/gallerycommon/src/com/android/gallery3d/exif/ExifInterface.java @@ -318,6 +318,13 @@ public class ExifInterface { public static final int TAG_INTEROPERABILITY_INDEX = defineTag(IfdId.TYPE_IFD_INTEROPERABILITY, (short) 1); + private static final String GPS_DATE_FORMAT_STR = "yyyy:MM:dd"; + private static final String DATETIME_FORMAT_STR = "yyyy:MM:dd kk:mm:ss"; + public static final DateFormat DATETIME_FORMAT = new SimpleDateFormat(DATETIME_FORMAT_STR); + private final DateFormat mGPSDateStampFormat = new SimpleDateFormat(GPS_DATE_FORMAT_STR); + private final Calendar mGPSTimeStampCalendar = Calendar + .getInstance(TimeZone.getTimeZone("UTC")); + /** * Tags that contain offset markers. These are included in the banned * defines. @@ -1944,13 +1951,6 @@ public class ExifInterface { return latLon; } - private static final String GPS_DATE_FORMAT_STR = "yyyy:MM:dd"; - private static final String DATETIME_FORMAT_STR = "yyyy:MM:dd kk:mm:ss"; - private final DateFormat mDateTimeStampFormat = new SimpleDateFormat(DATETIME_FORMAT_STR); - private final DateFormat mGPSDateStampFormat = new SimpleDateFormat(GPS_DATE_FORMAT_STR); - private final Calendar mGPSTimeStampCalendar = Calendar - .getInstance(TimeZone.getTimeZone("UTC")); - /** * Creates, formats, and sets the DateTimeStamp tag for one of: * {@link #TAG_DATE_TIME}, {@link #TAG_DATE_TIME_DIGITIZED}, @@ -1964,8 +1964,8 @@ public class ExifInterface { public boolean addDateTimeStampTag(int tagId, long timestamp, TimeZone timezone) { if (tagId == TAG_DATE_TIME || tagId == TAG_DATE_TIME_DIGITIZED || tagId == TAG_DATE_TIME_ORIGINAL) { - mDateTimeStampFormat.setTimeZone(timezone); - ExifTag t = buildTag(tagId, mDateTimeStampFormat.format(timestamp)); + DATETIME_FORMAT.setTimeZone(timezone); + ExifTag t = buildTag(tagId, DATETIME_FORMAT.format(timestamp)); if (t == null) { return false; } diff --git a/gallerycommon/src/com/android/gallery3d/exif/ExifTag.java b/gallerycommon/src/com/android/gallery3d/exif/ExifTag.java index c30a97143..186cb81cf 100644 --- a/gallerycommon/src/com/android/gallery3d/exif/ExifTag.java +++ b/gallerycommon/src/com/android/gallery3d/exif/ExifTag.java @@ -17,7 +17,6 @@ package com.android.gallery3d.exif; import java.nio.charset.Charset; -import java.text.SimpleDateFormat; import java.util.Arrays; import java.util.Date; @@ -102,8 +101,6 @@ public class ExifTag { // Value offset in exif header. private int mOffset; - private static final SimpleDateFormat TIME_FORMAT = new SimpleDateFormat("yyyy:MM:dd kk:mm:ss"); - /** * Returns true if the given IFD is a valid IFD. */ @@ -537,9 +534,10 @@ public class ExifTag { * @return true on success */ public boolean setTimeValue(long time) { - // synchronized on TIME_FORMAT as SimpleDateFormat is not thread safe - synchronized (TIME_FORMAT) { - return setValue(TIME_FORMAT.format(new Date(time))); + // synchronized on DATETIME_FORMAT as SimpleDateFormat is not thread + // safe + synchronized (ExifInterface.DATETIME_FORMAT) { + return setValue(ExifInterface.DATETIME_FORMAT.format(new Date(time))); } } |