summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/filtershow/filters
diff options
context:
space:
mode:
authornicolasroard <nicolasroard@google.com>2013-09-20 18:49:41 -0700
committernicolasroard <nicolasroard@google.com>2013-09-20 18:51:47 -0700
commit3bc6e6f3b5ac0bb989c5e2f1580bdb40ead5dc25 (patch)
treed9a87bd5d82cee90f5f7d7d049c83fec7462e9a1 /src/com/android/gallery3d/filtershow/filters
parent6904a72d84d6662c00be83186468600f84448590 (diff)
downloadandroid_packages_apps_Gallery2-3bc6e6f3b5ac0bb989c5e2f1580bdb40ead5dc25.tar.gz
android_packages_apps_Gallery2-3bc6e6f3b5ac0bb989c5e2f1580bdb40ead5dc25.tar.bz2
android_packages_apps_Gallery2-3bc6e6f3b5ac0bb989c5e2f1580bdb40ead5dc25.zip
Fix crash / jank / presets add
- don't cache immutable bitmaps - fix junk in anims/zoom/constrain - fix edge glow when moving - fix double-tap zoom - fix presets / user presets adds - fix state panel names for geometry ops bug:10803026 Change-Id: I9328d7005d3ecee3566c104c3392de9325c50b74
Diffstat (limited to 'src/com/android/gallery3d/filtershow/filters')
-rw-r--r--src/com/android/gallery3d/filtershow/filters/FilterCropRepresentation.java3
-rw-r--r--src/com/android/gallery3d/filtershow/filters/FilterMirrorRepresentation.java3
-rw-r--r--src/com/android/gallery3d/filtershow/filters/FilterRotateRepresentation.java3
-rw-r--r--src/com/android/gallery3d/filtershow/filters/FilterStraightenRepresentation.java3
4 files changed, 8 insertions, 4 deletions
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterCropRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterCropRepresentation.java
index ec4b57385..ba697d87f 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterCropRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterCropRepresentation.java
@@ -35,7 +35,7 @@ public class FilterCropRepresentation extends FilterRepresentation {
RectF mCrop = getNil();
public FilterCropRepresentation(RectF crop) {
- super(FilterCropRepresentation.class.getSimpleName());
+ super(SERIALIZATION_NAME);
setSerializationName(SERIALIZATION_NAME);
setShowParameterValue(true);
setFilterClass(FilterCropRepresentation.class);
@@ -48,6 +48,7 @@ public class FilterCropRepresentation extends FilterRepresentation {
public FilterCropRepresentation(FilterCropRepresentation m) {
this(m.mCrop);
+ setName(m.getName());
}
public FilterCropRepresentation() {
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterMirrorRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterMirrorRepresentation.java
index 84caa9e75..c2814432d 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterMirrorRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterMirrorRepresentation.java
@@ -66,7 +66,7 @@ public class FilterMirrorRepresentation extends FilterRepresentation {
}
public FilterMirrorRepresentation(Mirror mirror) {
- super(FilterMirrorRepresentation.class.getSimpleName());
+ super(SERIALIZATION_NAME);
setSerializationName(SERIALIZATION_NAME);
setShowParameterValue(false);
setFilterClass(FilterMirrorRepresentation.class);
@@ -79,6 +79,7 @@ public class FilterMirrorRepresentation extends FilterRepresentation {
public FilterMirrorRepresentation(FilterMirrorRepresentation m) {
this(m.getMirror());
+ setName(m.getName());
}
public FilterMirrorRepresentation() {
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterRotateRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterRotateRepresentation.java
index d7e0b581b..4299dd396 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterRotateRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterRotateRepresentation.java
@@ -62,7 +62,7 @@ public class FilterRotateRepresentation extends FilterRepresentation {
}
public FilterRotateRepresentation(Rotation rotation) {
- super(FilterRotateRepresentation.class.getSimpleName());
+ super(SERIALIZATION_NAME);
setSerializationName(SERIALIZATION_NAME);
setShowParameterValue(false);
setFilterClass(FilterRotateRepresentation.class);
@@ -75,6 +75,7 @@ public class FilterRotateRepresentation extends FilterRepresentation {
public FilterRotateRepresentation(FilterRotateRepresentation r) {
this(r.getRotation());
+ setName(r.getName());
}
public FilterRotateRepresentation() {
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterStraightenRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterStraightenRepresentation.java
index 4769b36ba..1ba80e8b4 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterStraightenRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterStraightenRepresentation.java
@@ -35,7 +35,7 @@ public class FilterStraightenRepresentation extends FilterRepresentation {
float mStraighten;
public FilterStraightenRepresentation(float straighten) {
- super(FilterStraightenRepresentation.class.getSimpleName());
+ super(SERIALIZATION_NAME);
setSerializationName(SERIALIZATION_NAME);
setShowParameterValue(true);
setFilterClass(FilterStraightenRepresentation.class);
@@ -48,6 +48,7 @@ public class FilterStraightenRepresentation extends FilterRepresentation {
public FilterStraightenRepresentation(FilterStraightenRepresentation s) {
this(s.getStraighten());
+ setName(s.getName());
}
public FilterStraightenRepresentation() {