diff options
author | Angus Kong <shkong@google.com> | 2013-05-31 16:52:47 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-31 16:52:47 +0000 |
commit | 067a56d3e43642e6ddfdad357ba6bdf4b3d2015f (patch) | |
tree | fb7aa003234c0ad627fbc5c6fd0e6a79ce3b825d /src | |
parent | 111bc7aeea0653f1a823af24174cd073420a9515 (diff) | |
parent | 7283c609ccca310cfc39a3d25bb1c58f4198a341 (diff) | |
download | android_packages_apps_Snap-067a56d3e43642e6ddfdad357ba6bdf4b3d2015f.tar.gz android_packages_apps_Snap-067a56d3e43642e6ddfdad357ba6bdf4b3d2015f.tar.bz2 android_packages_apps_Snap-067a56d3e43642e6ddfdad357ba6bdf4b3d2015f.zip |
Merge "Fix mistakenly reversed order in FilmStripView." into gb-ub-photos-carlsbad
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/camera/data/LocalData.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/camera/data/LocalData.java b/src/com/android/camera/data/LocalData.java index 2a077507c..9f9be8e80 100644 --- a/src/com/android/camera/data/LocalData.java +++ b/src/com/android/camera/data/LocalData.java @@ -56,9 +56,9 @@ abstract interface LocalData extends FilmStripView.ImageData { // is reversed. private static int compareDate(long v1, long v2) { if (v1 >= 0 && v2 >= 0) { - return ((v1 > v2) ? 1 : ((v1 < v2) ? -1 : 0)); + return ((v1 < v2) ? 1 : ((v1 > v2) ? -1 : 0)); } - return ((v2 > v1) ? 1 : ((v2 < v1) ? -1 : 0)); + return ((v2 < v1) ? 1 : ((v2 > v1) ? -1 : 0)); } @Override |