commit d3992d8958aa8067c4803f113bcbab9e7f5a61b0
author Angus Kong <shkong@google.com> Fri May 31 16:53:31 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 31 16:53:31 2013 +0000
tree 5869844aa54629e96c1a961a0a4efec75439f480
parent 067a56d3e43642e6ddfdad357ba6bdf4b3d2015f
parent accc6e55bbf0186be316e81fb4e82da4731f72e0

Merge "Don't use the same drawable for every view." into gb-ub-photos-carlsbad

src/com/android/camera/data/LocalData.java

diff --git a/src/com/android/camera/data/LocalData.java b/src/com/android/camera/data/LocalData.java
index 2a07750..9f9be8e 100644
--- a/src/com/android/camera/data/LocalData.java
+++ b/src/com/android/camera/data/LocalData.java
@@ -56,9 +56,9 @@
         // 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

src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java

diff --git a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
index 91bf676..3bb60bb 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
@@ -268,4 +268,9 @@
             }
         }
     }
+
+    // Override this in subclasses
+    public int getStyle() {
+        return -1;
+    }
 }