commit 59eb0f822c8ec33b8c5b97a95a170275df816d44
author nicolasroard <nicolasroard@google.com> Wed Jun 26 01:24:57 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 26 01:24:57 2013 +0000
tree c46821d15501b5e89047906fdadd6e29a6e5587c
parent b8e2ab31ce0584505502d6c438d1a781a3a26a3b
parent a3c1fb69e51861a11b79c397e63cbf3acd52ba5f

Merge "Cleanup ImagePreset to remove special-casing for borders" into gb-ub-photos-carlsbad

res/drawable-hdpi/ic_switch_pan.png

diff --git a/res/drawable-hdpi/ic_switch_pan.png b/res/drawable-hdpi/ic_switch_pan.png
deleted file mode 100644
index c8161be..0000000
--- a/res/drawable-hdpi/ic_switch_pan.png
+++ /dev/null
Binary files differ

res/drawable-mdpi/ic_switch_pan.png

diff --git a/res/drawable-mdpi/ic_switch_pan.png b/res/drawable-mdpi/ic_switch_pan.png
deleted file mode 100644
index e63b8e9..0000000
--- a/res/drawable-mdpi/ic_switch_pan.png
+++ /dev/null
Binary files differ

res/drawable-xhdpi/ic_switch_pan.png

diff --git a/res/drawable-xhdpi/ic_switch_pan.png b/res/drawable-xhdpi/ic_switch_pan.png
deleted file mode 100644
index f17ce2f..0000000
--- a/res/drawable-xhdpi/ic_switch_pan.png
+++ /dev/null
Binary files differ

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 c95a15a..9d103d5 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
@@ -17,6 +17,7 @@
 package com.android.gallery3d.filtershow.filters;
 
 import android.util.Log;
+
 import com.android.gallery3d.filtershow.editors.BasicEditor;
 
 public class FilterRepresentation implements Cloneable {
@@ -229,7 +230,7 @@
     public void deSerializeRepresentation(String[][] rep) {
         for (int i = 0; i < rep.length; i++) {
             if ("Name".equals(rep[i][0])) {
-                mName = rep[i][0];
+                mName = rep[i][1];
                 break;
             }
         }