summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
diff options
context:
space:
mode:
authorJohn Hoford <hoford@google.com>2013-04-22 13:40:39 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-22 13:40:39 -0700
commitb6754c1cea1c1b7974b9eedc0b0357dd9fccb9d5 (patch)
treec4344f5033e004f57029d2721cfe9a866e69b937 /src/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
parent871d0fde36284a5861174514544ea225459a0cb3 (diff)
parent91d26f6c3b183862eeffc1856e2d758e800d13f4 (diff)
downloadandroid_packages_apps_Gallery2-b6754c1cea1c1b7974b9eedc0b0357dd9fccb9d5.tar.gz
android_packages_apps_Gallery2-b6754c1cea1c1b7974b9eedc0b0357dd9fccb9d5.tar.bz2
android_packages_apps_Gallery2-b6754c1cea1c1b7974b9eedc0b0357dd9fccb9d5.zip
am 91d26f6c: tiny planet fix
* commit '91d26f6c3b183862eeffc1856e2d758e800d13f4': tiny planet fix
Diffstat (limited to 'src/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java')
-rw-r--r--src/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
index c570a757e..48c8b380e 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
@@ -34,6 +34,7 @@ public class FilterTinyPlanetRepresentation extends FilterBasicRepresentation {
setTextId(R.string.tinyplanet);
setButtonId(R.id.tinyplanetButton);
setEditorId(EditorTinyPlanet.ID);
+ setMinimum(1);
}
@Override
@@ -45,6 +46,14 @@ public class FilterTinyPlanetRepresentation extends FilterBasicRepresentation {
return representation;
}
+ @Override
+ public void useParametersFrom(FilterRepresentation a) {
+ FilterTinyPlanetRepresentation representation = (FilterTinyPlanetRepresentation) a;
+ super.useParametersFrom(a);
+ mAngle = representation.mAngle;
+ setZoom(representation.getZoom());
+ }
+
public void setAngle(float angle) {
mAngle = angle;
}