diff options
author | Flamefire <alex@grundis.de> | 2014-09-17 02:40:04 +0200 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2015-03-28 14:58:54 -0700 |
commit | a1ad934b563bbd5ddc68b5e9caf460975caa34a0 (patch) | |
tree | c55991dcdc8bf58ec6cb014b4eb0d6a499c837c8 /gallerycommon/src | |
parent | bc5f6cc1c376878786dd70042a9e0f8c18c3723a (diff) | |
download | android_packages_apps_Gallery2-a1ad934b563bbd5ddc68b5e9caf460975caa34a0.tar.gz android_packages_apps_Gallery2-a1ad934b563bbd5ddc68b5e9caf460975caa34a0.tar.bz2 android_packages_apps_Gallery2-a1ad934b563bbd5ddc68b5e9caf460975caa34a0.zip |
Add record time to details view
PS2: Move strings
PS3: Move DateTime format to public in ExifInterface
PS4: Actually use that DateTime format
Change-Id: If30e19d0b79039357f393752544c655e073a46d2
Diffstat (limited to 'gallerycommon/src')
-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))); } } |