summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d
diff options
context:
space:
mode:
authornicolasroard <nicolasroard@google.com>2013-02-12 16:06:15 -0800
committernicolasroard <nicolasroard@google.com>2013-02-12 16:06:28 -0800
commit3c9697065497a94e03661c05d636df0187fb95c4 (patch)
treeb3643a8823dd0eb97cad52e108238746b71aeeb9 /src/com/android/gallery3d
parent32766ee5041cdefb8659c41a7fb075a6256f4b46 (diff)
downloadandroid_packages_apps_Snap-3c9697065497a94e03661c05d636df0187fb95c4.tar.gz
android_packages_apps_Snap-3c9697065497a94e03661c05d636df0187fb95c4.tar.bz2
android_packages_apps_Snap-3c9697065497a94e03661c05d636df0187fb95c4.zip
Turn back on the state panel
Change-Id: I22706078d4026ce4e24917c484a30a56de431983
Diffstat (limited to 'src/com/android/gallery3d')
-rw-r--r--src/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java4
-rw-r--r--src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java4
-rw-r--r--src/com/android/gallery3d/filtershow/presets/ImagePreset.java2
3 files changed, 9 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
index f6f308dba..2410ebe72 100644
--- 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 2b6c3fe7d..0aa449303 100644
--- 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 b81659a1a..0582b34bc 100644
--- 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();
}