diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2012-10-24 16:33:47 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-24 16:33:48 -0700 |
| commit | ecbdca3de8ada82d3d6f723d9ba509a3b1b1b290 (patch) | |
| tree | bef06d52126999167a5813cb50b2e767ff9ae91f /src/com | |
| parent | 0a23b42e4a3e3a93ce7389bfb7352944f644add6 (diff) | |
| parent | 89c755cbe16f5fe6f57be429a850331cc67a46d5 (diff) | |
| download | android_packages_apps_Gallery2-ecbdca3de8ada82d3d6f723d9ba509a3b1b1b290.tar.gz android_packages_apps_Gallery2-ecbdca3de8ada82d3d6f723d9ba509a3b1b1b290.tar.bz2 android_packages_apps_Gallery2-ecbdca3de8ada82d3d6f723d9ba509a3b1b1b290.zip | |
Merge "Initialize the modified date correctly." into gb-ub-photos-arches
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/gallery3d/app/TrimVideo.java | 15 | ||||
| -rw-r--r-- | src/com/android/gallery3d/data/LocalVideo.java | 2 |
2 files changed, 11 insertions, 6 deletions
diff --git a/src/com/android/gallery3d/app/TrimVideo.java b/src/com/android/gallery3d/app/TrimVideo.java index 01fe462c2..38b403b10 100644 --- a/src/com/android/gallery3d/app/TrimVideo.java +++ b/src/com/android/gallery3d/app/TrimVideo.java @@ -342,15 +342,15 @@ public class TrimVideo extends Activity implements * Insert the content (saved file) with proper video properties. */ private Uri insertContent(File file) { - long now = System.currentTimeMillis() / 1000; - + long nowInMs = System.currentTimeMillis(); + long nowInSec = nowInMs / 1000; final ContentValues values = new ContentValues(12); values.put(Video.Media.TITLE, mSaveFileName); values.put(Video.Media.DISPLAY_NAME, file.getName()); values.put(Video.Media.MIME_TYPE, "video/mp4"); - values.put(Video.Media.DATE_TAKEN, now); - values.put(Video.Media.DATE_MODIFIED, now); - values.put(Video.Media.DATE_ADDED, now); + values.put(Video.Media.DATE_TAKEN, nowInMs); + values.put(Video.Media.DATE_MODIFIED, nowInSec); + values.put(Video.Media.DATE_ADDED, nowInSec); values.put(Video.Media.DATA, file.getAbsolutePath()); values.put(Video.Media.SIZE, file.length()); // Copy the data taken and location info from src. @@ -365,7 +365,10 @@ public class TrimVideo extends Activity implements querySource(projection, new ContentResolverQueryCallback() { @Override public void onCursorResult(Cursor cursor) { - values.put(Video.Media.DATE_TAKEN, cursor.getLong(0)); + long timeTaken = cursor.getLong(0); + if (timeTaken > 0) { + values.put(Video.Media.DATE_TAKEN, timeTaken); + } double latitude = cursor.getDouble(1); double longitude = cursor.getDouble(2); // TODO: Change || to && after the default location issue is diff --git a/src/com/android/gallery3d/data/LocalVideo.java b/src/com/android/gallery3d/data/LocalVideo.java index c876d81b1..44b853901 100644 --- a/src/com/android/gallery3d/data/LocalVideo.java +++ b/src/com/android/gallery3d/data/LocalVideo.java @@ -105,6 +105,8 @@ public class LocalVideo extends LocalMediaItem { latitude = cursor.getDouble(INDEX_LATITUDE); longitude = cursor.getDouble(INDEX_LONGITUDE); dateTakenInMs = cursor.getLong(INDEX_DATE_TAKEN); + dateAddedInSec = cursor.getLong(INDEX_DATE_ADDED); + dateModifiedInSec = cursor.getLong(INDEX_DATE_MODIFIED); filePath = cursor.getString(INDEX_DATA); durationInSec = cursor.getInt(INDEX_DURATION) / 1000; bucketId = cursor.getInt(INDEX_BUCKET_ID); |