diff options
author | nicolasroard <nicolasroard@google.com> | 2013-05-01 20:30:04 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-01 20:30:04 -0700 |
commit | 4f347d06a1825b4891c97c778a03643587ed5f51 (patch) | |
tree | 4d40328def05636805f65005a428164c7bf8b3b2 /src/com/android | |
parent | 92351fbc7c9829c3c1317334ed6c5d41ce8f749c (diff) | |
parent | 7c5349cd12130c41e56f061f369a0babbaa9107c (diff) | |
download | android_packages_apps_Snap-4f347d06a1825b4891c97c778a03643587ed5f51.tar.gz android_packages_apps_Snap-4f347d06a1825b4891c97c778a03643587ed5f51.tar.bz2 android_packages_apps_Snap-4f347d06a1825b4891c97c778a03643587ed5f51.zip |
am 00259461: Fix UI
* commit '00259461be82e601b58d3e970afbf0c012c5f3e7':
Fix UI
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java | 2 | ||||
-rw-r--r-- | src/com/android/gallery3d/filtershow/presets/ImagePreset.java | 14 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java index 37d66f829..91bf676f3 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java @@ -131,7 +131,7 @@ public class FilterRepresentation implements Cloneable { } public boolean supportsPartialRendering() { - return mSupportsPartialRendering; + return false && mSupportsPartialRendering; // disable for now } public void setSupportsPartialRendering(boolean value) { diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java index b594d9a02..fa12f8729 100644 --- a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java +++ b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java @@ -573,20 +573,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) { |