From 835173d0e6fd90a8298d28f7688fa1bb5cb80c64 Mon Sep 17 00:00:00 2001
From: nicolasroard <nicolasroard@google.com>
Date: Tue, 12 Feb 2013 16:32:43 -0800
Subject: [PATCH] Clean up red eye correction

Change-Id: I19a8006ed31767ae8e33388cc5b11b5c68d5ae2d
---
 res/layout/filtershow_activity.xml                          | 13 -------------
 .../filtershow/filters/FilterRedEyeRepresentation.java      |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml
index 20b0ece7e..9606d9129 100644
--- a/res/layout/filtershow_activity.xml
+++ b/res/layout/filtershow_activity.xml
@@ -99,12 +99,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
 
-            <com.android.gallery3d.filtershow.imageshow.ImageRedEye
-                android:id="@+id/imageRedEyes"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:visibility="gone" />
-
             <com.android.gallery3d.filtershow.imageshow.ImageDraw
                 android:id="@+id/imageDraw"
                 android:layout_width="match_parent"
@@ -245,13 +239,6 @@
                         android:drawableTop="@drawable/filtershow_button_geometry_flip"
                         android:text="@string/mirror" />
 
-                    <com.android.gallery3d.filtershow.ui.IconButton
-                        android:id="@+id/redEyeButton"
-                        android:layout_height="match_parent"
-                        style="@style/IconButton"
-                        android:drawableTop="@drawable/photoeditor_effect_redeye"
-                        android:text="@string/redeye" />
-
                 </LinearLayout>
             </HorizontalScrollView>
 
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
index 2667cc8e9..329f5204e 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
@@ -32,9 +32,9 @@ public class FilterRedEyeRepresentation extends FilterRepresentation {
         super("RedEye");
         setFilterClass(ImageFilterRedEye.class);
         setPriority(FilterRepresentation.TYPE_NORMAL);
-        setButtonId(R.id.redEyeButton);
         setTextId(R.string.redeye);
         setEditorId(EditorRedEye.ID);
+        setOverlayId(R.drawable.photoeditor_effect_redeye);
     }
 
     @Override
-- 
2.11.0