summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/filtershow/presets
diff options
context:
space:
mode:
authornicolasroard <nicolasroard@google.com>2013-04-30 20:50:03 -0700
committernicolasroard <nicolasroard@google.com>2013-05-01 19:02:55 -0700
commit00259461be82e601b58d3e970afbf0c012c5f3e7 (patch)
tree6aa970f5f8a8a5774853b9b17f6fd89df63fdae9 /src/com/android/gallery3d/filtershow/presets
parent5a352be0df79b03c942eb67a799ddb3aaa1a26a2 (diff)
downloadandroid_packages_apps_Gallery2-00259461be82e601b58d3e970afbf0c012c5f3e7.tar.gz
android_packages_apps_Gallery2-00259461be82e601b58d3e970afbf0c012c5f3e7.tar.bz2
android_packages_apps_Gallery2-00259461be82e601b58d3e970afbf0c012c5f3e7.zip
Fix UI
bug:8664728 Change-Id: I90b903e8935b2b6c0dbd6590cff36865644c49b4
Diffstat (limited to 'src/com/android/gallery3d/filtershow/presets')
-rw-r--r--src/com/android/gallery3d/filtershow/presets/ImagePreset.java14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
index 3530935e1..ed0a72a33 100644
--- a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
+++ b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
@@ -554,20 +554,24 @@ public class ImagePreset {
if (imageStateAdapter == null) {
return;
}
- imageStateAdapter.clear();
- imageStateAdapter.addOriginal();
+ Vector<State> states = new Vector<State>();
// TODO: supports Geometry representations in the state panel.
if (false && mGeoData != null && mGeoData.hasModifications()) {
State geo = new State("Geometry");
geo.setFilterRepresentation(mGeoData);
- imageStateAdapter.add(geo);
+ states.add(geo);
+ }
+ for (FilterRepresentation filter : mFilters) {
+ State state = new State(filter.getName());
+ state.setFilterRepresentation(filter);
+ states.add(state);
}
- imageStateAdapter.addAll(mFilters);
if (mBorder != null) {
State border = new State(mBorder.getName());
border.setFilterRepresentation(mBorder);
- imageStateAdapter.add(border);
+ states.add(border);
}
+ imageStateAdapter.fill(states);
}
public void setPartialRendering(boolean partialRendering, Rect bounds) {