Turn back on the state panel

Change-Id: I22706078d4026ce4e24917c484a30a56de431983

diff --git a/res/menu/filtershow_activity_menu.xml b/res/menu/filtershow_activity_menu.xml
index efb8747..4ea7d17 100644 (file)
--- a/res/menu/filtershow_activity_menu.xml
+++ b/res/menu/filtershow_activity_menu.xml
@@ -27,6 +27,6 @@
     <item
         android:id="@+id/showImageStateButton"
         android:showAsAction="never"
-        android:visible="false"
+        android:visible="true"
         android:title="@string/show_imagestate_panel" />
 </menu>

diff --git a/src/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
index f6f308d..2410ebe 100644 (file)
--- a/src/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
@@ -121,4 +121,8 @@ public class FilterBasicRepresentation extends FilterRepresentation {
     public void setPreviewValue(int previewValue) {
         mPreviewValue = previewValue;
     }
+
+    public String getStateRepresentation() {
+        return "" + getValue();
+    }
 }

diff --git a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
index 2b6c3fe..0aa4493 100644 (file)
--- a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
@@ -186,4 +186,8 @@ public class FilterRepresentation implements Cloneable {
     public void setShowUtilityPanel(boolean showUtilityPanel) {
         mShowUtilityPanel = showUtilityPanel;
     }
+
+    public String getStateRepresentation() {
+        return "";
+    }
 }

diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
index b81659a..0582b34 100644 (file)
--- a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
+++ b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
@@ -425,7 +425,7 @@ public class ImagePreset {
         }
         imageStateAdapter.clear();
         // TODO: re-enable the state panel
-        // imageStateAdapter.addAll(mFilters);
+        imageStateAdapter.addAll(mFilters);
         imageStateAdapter.notifyDataSetChanged();
     }