summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authornicolasroard <nicolasroard@google.com>2013-04-25 15:20:11 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-25 15:20:11 +0000
commit7873e5b0f4e97aaadbcbb9064f31fdba48405945 (patch)
tree1917e548ba4a66e2dfd5b9186e89cb0840d01464 /src/com/android
parent1bdfe386e73ce15c41c2c17ba347c693776b4a08 (diff)
parentc4ee244da0fe31a9fce8cb5ec07ad1d8e52d6daf (diff)
downloadandroid_packages_apps_Snap-7873e5b0f4e97aaadbcbb9064f31fdba48405945.tar.gz
android_packages_apps_Snap-7873e5b0f4e97aaadbcbb9064f31fdba48405945.tar.bz2
android_packages_apps_Snap-7873e5b0f4e97aaadbcbb9064f31fdba48405945.zip
Merge "UI changes" into gb-ub-photos-bryce
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/gallery3d/filtershow/presets/ImagePreset.java19
1 files changed, 19 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
index ca97761ed..e0ff0b3e6 100644
--- a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
+++ b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
@@ -28,6 +28,7 @@ import com.android.gallery3d.filtershow.filters.FilterRepresentation;
import com.android.gallery3d.filtershow.filters.ImageFilter;
import com.android.gallery3d.filtershow.imageshow.GeometryMetadata;
import com.android.gallery3d.filtershow.imageshow.MasterImage;
+import com.android.gallery3d.filtershow.state.State;
import com.android.gallery3d.filtershow.state.StateAdapter;
import java.util.Vector;
@@ -369,6 +370,11 @@ public class ImagePreset {
}
public void removeFilter(FilterRepresentation filterRepresentation) {
+ if (filterRepresentation.getPriority() == FilterRepresentation.TYPE_BORDER) {
+ setBorder(null);
+ setHistoryName("Remove");
+ return;
+ }
for (int i = 0; i < mFilters.size(); i++) {
if (mFilters.elementAt(i).getFilterClass() == filterRepresentation.getFilterClass()) {
mFilters.remove(i);
@@ -539,7 +545,20 @@ public class ImagePreset {
if (imageStateAdapter == null) {
return;
}
+ imageStateAdapter.clear();
+ imageStateAdapter.addOriginal();
+ // 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);
+ }
imageStateAdapter.addAll(mFilters);
+ if (mBorder != null) {
+ State border = new State(mBorder.getName());
+ border.setFilterRepresentation(mBorder);
+ imageStateAdapter.add(border);
+ }
}
public void setPartialRendering(boolean partialRendering, Rect bounds) {