summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/filtershow/filters
diff options
context:
space:
mode:
authornicolasroard <nicolasroard@google.com>2013-08-12 14:04:11 -0700
committernicolasroard <nicolasroard@google.com>2013-08-12 14:04:11 -0700
commit57bd092bd5757576f07341135272ed1c3df729ff (patch)
tree5c5d40b4451a2df55132a857bef236e4b5bff41a /src/com/android/gallery3d/filtershow/filters
parent8b9cc5f374fa8bded7f84af6ce73123be2754ccc (diff)
downloadandroid_packages_apps_Gallery2-57bd092bd5757576f07341135272ed1c3df729ff.tar.gz
android_packages_apps_Gallery2-57bd092bd5757576f07341135272ed1c3df729ff.tar.bz2
android_packages_apps_Gallery2-57bd092bd5757576f07341135272ed1c3df729ff.zip
Makes rotate and mirror direct operations
Change-Id: I10128c211ec6e269603e3b3f3cbafadbeabdaac5
Diffstat (limited to 'src/com/android/gallery3d/filtershow/filters')
-rw-r--r--src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java11
-rw-r--r--src/com/android/gallery3d/filtershow/filters/FilterMirrorRepresentation.java5
-rw-r--r--src/com/android/gallery3d/filtershow/filters/FilterRotateRepresentation.java5
3 files changed, 7 insertions, 14 deletions
diff --git a/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java b/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
index 3fa91916d..ce7b44b86 100644
--- a/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
+++ b/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
@@ -242,13 +242,6 @@ public abstract class BaseFiltersManager implements FiltersManagerInterface {
public void addTools(Context context) {
- int[] editorsId = {
- EditorCrop.ID,
- EditorStraighten.ID,
- EditorRotate.ID,
- EditorMirror.ID
- };
-
int[] textId = {
R.string.crop,
R.string.straighten,
@@ -270,10 +263,8 @@ public abstract class BaseFiltersManager implements FiltersManagerInterface {
new FilterMirrorRepresentation()
};
- for (int i = 0; i < editorsId.length; i++) {
- int editorId = editorsId[i];
+ for (int i = 0; i < textId.length; i++) {
FilterRepresentation geometry = geometryFilters[i];
- geometry.setEditorId(editorId);
geometry.setTextId(textId[i]);
geometry.setOverlayId(overlayId[i]);
geometry.setOverlayOnly(true);
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterMirrorRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterMirrorRepresentation.java
index d8d0709ed..765796ea5 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterMirrorRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterMirrorRepresentation.java
@@ -22,6 +22,7 @@ import android.util.Log;
import com.android.gallery3d.R;
import com.android.gallery3d.filtershow.editors.EditorMirror;
+import com.android.gallery3d.filtershow.editors.ImageOnlyEditor;
import java.io.IOException;
@@ -63,12 +64,12 @@ public class FilterMirrorRepresentation extends FilterRepresentation {
public FilterMirrorRepresentation(Mirror mirror) {
super(FilterMirrorRepresentation.class.getSimpleName());
setSerializationName(SERIALIZATION_NAME);
- setShowParameterValue(true);
+ setShowParameterValue(false);
setFilterClass(FilterMirrorRepresentation.class);
setFilterType(FilterRepresentation.TYPE_GEOMETRY);
setSupportsPartialRendering(true);
setTextId(R.string.mirror);
- setEditorId(EditorMirror.ID);
+ setEditorId(ImageOnlyEditor.ID);
setMirror(mirror);
}
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterRotateRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterRotateRepresentation.java
index b6f95d843..d7e0b581b 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterRotateRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterRotateRepresentation.java
@@ -22,6 +22,7 @@ import android.util.Log;
import com.android.gallery3d.R;
import com.android.gallery3d.filtershow.editors.EditorRotate;
+import com.android.gallery3d.filtershow.editors.ImageOnlyEditor;
import java.io.IOException;
@@ -63,12 +64,12 @@ public class FilterRotateRepresentation extends FilterRepresentation {
public FilterRotateRepresentation(Rotation rotation) {
super(FilterRotateRepresentation.class.getSimpleName());
setSerializationName(SERIALIZATION_NAME);
- setShowParameterValue(true);
+ setShowParameterValue(false);
setFilterClass(FilterRotateRepresentation.class);
setFilterType(FilterRepresentation.TYPE_GEOMETRY);
setSupportsPartialRendering(true);
setTextId(R.string.rotate);
- setEditorId(EditorRotate.ID);
+ setEditorId(ImageOnlyEditor.ID);
setRotation(rotation);
}