summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authornicolasroard <nicolasroard@google.com>2012-10-16 13:14:38 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-16 13:14:38 -0700
commit3ed84942ccf4204769a5e0c4db941f90eb209133 (patch)
tree7d409663a6e844de63346312198112e29906861f /res
parent7af9fac4296da9e93a730671425cf55ff2232bbc (diff)
parentca51847ff110310067cfd964ec7d642c74ba1615 (diff)
downloadandroid_packages_apps_Snap-3ed84942ccf4204769a5e0c4db941f90eb209133.tar.gz
android_packages_apps_Snap-3ed84942ccf4204769a5e0c4db941f90eb209133.tar.bz2
android_packages_apps_Snap-3ed84942ccf4204769a5e0c4db941f90eb209133.zip
Merge "Fix curves tool" into gb-ub-photos-arches
Diffstat (limited to 'res')
-rw-r--r--res/layout/filtershow_activity.xml10
1 files changed, 10 insertions, 0 deletions
diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml
index e8a988ff1..885521104 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"