commit f464958e6bc926e0c4a776d11a9f2aa8514a866f
author Angus Kong <shkong@google.com> Fri May 31 16:53:45 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 31 16:53:45 2013 +0000
tree 2fad923018cce8a572ee2eb2057a08d75909beb6
parent d3992d8958aa8067c4803f113bcbab9e7f5a61b0
parent 0980fe89b2c0d2d8f75cb43a5fe06c00b8c8901e

Merge "Translate the first/last view too." into gb-ub-photos-carlsbad

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

diff --git a/src/com/android/camera/data/CameraDataAdapter.java b/src/com/android/camera/data/CameraDataAdapter.java
index 2bce1b4..1e5f1a8 100644
--- a/src/com/android/camera/data/CameraDataAdapter.java
+++ b/src/com/android/camera/data/CameraDataAdapter.java
@@ -106,7 +106,8 @@
         }
 
         return mImages.get(dataID).getView(
-                c, mSuggestedWidth, mSuggestedHeight, mPlaceHolder);
+                c, mSuggestedWidth, mSuggestedHeight,
+                mPlaceHolder.getConstantState().newDrawable());
     }
 
     @Override

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;
+    }
 }