summaryrefslogtreecommitdiffstats
path: root/res/layout/filtershow_activity.xml
diff options
context:
space:
mode:
authorJohn Hoford <hoford@google.com>2012-10-10 14:17:30 -0700
committerJohn Hoford <hoford@google.com>2012-10-10 15:09:37 -0700
commit4988eff4c8eda325a616337d1aaa0666cc301a7c (patch)
treecc9236717df6eb4b112901d8544f426927594cc1 /res/layout/filtershow_activity.xml
parentdb3b0d4cd1dc66d71f547fb4eb1c8d88b319185b (diff)
downloadandroid_packages_apps_Gallery2-4988eff4c8eda325a616337d1aaa0666cc301a7c.tar.gz
android_packages_apps_Gallery2-4988eff4c8eda325a616337d1aaa0666cc301a7c.tar.bz2
android_packages_apps_Gallery2-4988eff4c8eda325a616337d1aaa0666cc301a7c.zip
add White balance & disable UI elements
bug:7234321 Change-Id: Ic44bfe30b5d25e7d4442c4e6d4fd9e0e8410c7af
Diffstat (limited to 'res/layout/filtershow_activity.xml')
-rw-r--r--res/layout/filtershow_activity.xml32
1 files changed, 20 insertions, 12 deletions
diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml
index 178f18a68..6f1b1901e 100644
--- a/res/layout/filtershow_activity.xml
+++ b/res/layout/filtershow_activity.xml
@@ -276,7 +276,9 @@
android:id="@+id/redEyeButton"
style="@style/FilterShowBottomButton"
android:src="@drawable/photoeditor_effect_redeye"
- android:text="@string/redeye" />
+ android:text="@string/redeye"
+ android:visibility="gone" />
+
</LinearLayout>
</HorizontalScrollView>
@@ -294,22 +296,22 @@
android:orientation="horizontal" >
<com.android.gallery3d.filtershow.ui.ImageButtonTitle
- android:id="@+id/exposureButton"
+ android:id="@+id/wbalanceButton"
style="@style/FilterShowBottomButton"
android:src="@drawable/filtershow_button_colors_contrast"
- android:text="@string/exposure" />
+ android:text="@string/wbalance" />
<com.android.gallery3d.filtershow.ui.ImageButtonTitle
- android:id="@+id/vibranceButton"
+ android:id="@+id/exposureButton"
style="@style/FilterShowBottomButton"
android:src="@drawable/filtershow_button_colors_contrast"
- android:text="@string/vibrance" />
+ android:text="@string/exposure" />
<com.android.gallery3d.filtershow.ui.ImageButtonTitle
- android:id="@+id/saturationButton"
+ android:id="@+id/vibranceButton"
style="@style/FilterShowBottomButton"
android:src="@drawable/filtershow_button_colors_contrast"
- android:text="@string/saturation" />
+ android:text="@string/vibrance" />
<com.android.gallery3d.filtershow.ui.ImageButtonTitle
android:id="@+id/contrastButton"
@@ -336,16 +338,22 @@
android:text="@string/sharpen" />
<com.android.gallery3d.filtershow.ui.ImageButtonTitle
- android:id="@+id/tintButton"
+ android:id="@+id/curvesButtonRGB"
+ style="@style/FilterShowBottomButton"
+ android:src="@drawable/filtershow_button_colors_curve"
+ android:text="@string/curvesRGB" />
+
+ <com.android.gallery3d.filtershow.ui.ImageButtonTitle
+ android:id="@+id/hueButton"
style="@style/FilterShowBottomButton"
android:src="@drawable/filtershow_button_colors_contrast"
- android:text="@string/tint" />
+ android:text="@string/hue" />
<com.android.gallery3d.filtershow.ui.ImageButtonTitle
- android:id="@+id/curvesButtonRGB"
+ android:id="@+id/saturationButton"
style="@style/FilterShowBottomButton"
- android:src="@drawable/filtershow_button_colors_curve"
- android:text="@string/curvesRGB" />
+ android:src="@drawable/filtershow_button_colors_contrast"
+ android:text="@string/saturation" />
</LinearLayout>
</HorizontalScrollView>