summaryrefslogtreecommitdiffstats
path: root/src
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
commit7c5349cd12130c41e56f061f369a0babbaa9107c (patch)
tree7744467f483106251fefdf05c01d94f948686dfe /src
parent8468e0e50dc2cf00cdf288fca0b56049d12ef598 (diff)
downloadandroid_packages_apps_Snap-7c5349cd12130c41e56f061f369a0babbaa9107c.tar.gz
android_packages_apps_Snap-7c5349cd12130c41e56f061f369a0babbaa9107c.tar.bz2
android_packages_apps_Snap-7c5349cd12130c41e56f061f369a0babbaa9107c.zip
Fix UI
bug:8664728 Change-Id: I90b903e8935b2b6c0dbd6590cff36865644c49b4
Diffstat (limited to 'src')
-rw-r--r--src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java2
-rw-r--r--src/com/android/gallery3d/filtershow/presets/ImagePreset.java14
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 5bb0e5733..82012b992 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
@@ -117,7 +117,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 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) {