diff options
| author | nicolasroard <nicolasroard@google.com> | 2013-02-13 00:09:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-13 00:09:32 +0000 |
| commit | 40036d4793206e58f578436cae6b462f4e29e70c (patch) | |
| tree | 1697b34ccfb832900632de25e0a0b2cf4121bdb8 /src/com/android/gallery3d/filtershow | |
| parent | 80980cbad5867f10d5ad36687db2c5ef3101b5d7 (diff) | |
| parent | 3c9697065497a94e03661c05d636df0187fb95c4 (diff) | |
| download | android_packages_apps_Snap-40036d4793206e58f578436cae6b462f4e29e70c.tar.gz android_packages_apps_Snap-40036d4793206e58f578436cae6b462f4e29e70c.tar.bz2 android_packages_apps_Snap-40036d4793206e58f578436cae6b462f4e29e70c.zip | |
Merge "Turn back on the state panel" into gb-ub-photos-bryce
Diffstat (limited to 'src/com/android/gallery3d/filtershow')
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(); } |