commit 408fbfdd78ea6d90f4fd2bdfa234a161a436d1aa
author nicolasroard <nicolasroard@google.com> Sat Mar 30 22:01:33 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Mar 30 22:01:34 2013 +0000
tree 41254f419f60bcd042b9251a421c4448e04f6bfe
parent d4545febbff39febd1058e1aa60e0c8b7659204f
parent 05022e50a7d280d990c2dca74f69a7da55bdd3b8

Merge "Fix double-tap behaviour" into gb-ub-photos-bryce

src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java

diff --git a/src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java b/src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
index ce66b5b..a8c8d7b 100644
--- a/src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
+++ b/src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
@@ -105,12 +105,6 @@
             case COMPUTE_RENDERING_REQUEST:
             case COMPUTE_PARTIAL_RENDERING_REQUEST:
             case COMPUTE_HIGHRES_RENDERING_REQUEST: {
-                if (msg.what == COMPUTE_PARTIAL_RENDERING_REQUEST
-                        || msg.what == COMPUTE_HIGHRES_RENDERING_REQUEST) {
-                    if (mProcessingHandler.hasMessages(msg.what)) {
-                        return false;
-                    }
-                }
 
                 if (DEBUG) {
                     Log.v(LOGTAG, "Compute Request: " + getType(msg.what));
@@ -168,6 +162,9 @@
         msg.obj = request;
         if (type == COMPUTE_PARTIAL_RENDERING_REQUEST
                 || type == COMPUTE_HIGHRES_RENDERING_REQUEST) {
+            if (mProcessingHandler.hasMessages(msg.what)) {
+                mProcessingHandler.removeMessages(msg.what);
+            }
             mProcessingHandler.sendMessageDelayed(msg, HIRES_DELAY);
         } else {
             mProcessingHandler.sendMessage(msg);

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 b92460d..7e0e25d 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
@@ -63,7 +63,8 @@
         representation.setShowEditingControls(showEditingControls());
         representation.setShowParameterValue(showParameterValue());
         representation.setShowUtilityPanel(showUtilityPanel());
-        representation.mTempRepresentation = null;
+        representation.mTempRepresentation =
+                mTempRepresentation != null ? mTempRepresentation.clone() : null;
         if (DEBUG) {
             Log.v(LOGTAG, "cloning from <" + this + "> to <" + representation + ">");
         }