commit 3ed84942ccf4204769a5e0c4db941f90eb209133
author nicolasroard <nicolasroard@google.com> Tue Oct 16 13:14:38 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 16 13:14:38 2012 -0700
tree 7d409663a6e844de63346312198112e29906861f
parent 7af9fac4296da9e93a730671425cf55ff2232bbc
parent ca51847ff110310067cfd964ec7d642c74ba1615

Merge "Fix curves tool" into gb-ub-photos-arches

res/layout/filtershow_activity.xml

diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml
index e8a988f..8855211 100644
--- a/res/layout/filtershow_activity.xml
+++ b/res/layout/filtershow_activity.xml
@@ -137,6 +137,7 @@
                 android:id="@+id/imageCurves"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layerType="software"
                 android:visibility="gone" />
 
             <com.android.gallery3d.filtershow.imageshow.ImageBorder
@@ -191,6 +192,15 @@
                 android:orientation="horizontal"
                 android:visibility="gone" >
 
+                <ImageButton
+                    android:id="@+id/pickCurvesChannel"
+                    android:layout_width="64dip"
+                    android:layout_height="64dip"
+                    android:layout_gravity="center_vertical|left"
+                    android:scaleType="centerInside"
+                    android:text="@string/curvesRGB"
+                    android:src="@drawable/filtershow_button_show_original" />
+
                 <Button
                     android:id="@+id/applyEffect"
                     android:layout_width="wrap_content"