am f8044659: Merge "add White balance & disable UI elements" into gb-ub-photos-arches
* commit 'f8044659db592f49e6e77c8a1d595955f9d206cb':
add White balance & disable UI elements
diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml
index 178f18a..6f1b190 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,6 +296,12 @@
android:orientation="horizontal" >
<com.android.gallery3d.filtershow.ui.ImageButtonTitle
+ android:id="@+id/wbalanceButton"
+ style="@style/FilterShowBottomButton"
+ android:src="@drawable/filtershow_button_colors_contrast"
+ android:text="@string/wbalance" />
+
+ <com.android.gallery3d.filtershow.ui.ImageButtonTitle
android:id="@+id/exposureButton"
style="@style/FilterShowBottomButton"
android:src="@drawable/filtershow_button_colors_contrast"
@@ -306,12 +314,6 @@
android:text="@string/vibrance" />
<com.android.gallery3d.filtershow.ui.ImageButtonTitle
- android:id="@+id/saturationButton"
- style="@style/FilterShowBottomButton"
- android:src="@drawable/filtershow_button_colors_contrast"
- android:text="@string/saturation" />
-
- <com.android.gallery3d.filtershow.ui.ImageButtonTitle
android:id="@+id/contrastButton"
style="@style/FilterShowBottomButton"
android:src="@drawable/filtershow_button_colors_contrast"
@@ -336,17 +338,23 @@
android:text="@string/sharpen" />
<com.android.gallery3d.filtershow.ui.ImageButtonTitle
- android:id="@+id/tintButton"
- style="@style/FilterShowBottomButton"
- android:src="@drawable/filtershow_button_colors_contrast"
- android:text="@string/tint" />
-
- <com.android.gallery3d.filtershow.ui.ImageButtonTitle
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/hue" />
+
+ <com.android.gallery3d.filtershow.ui.ImageButtonTitle
+ android:id="@+id/saturationButton"
+ style="@style/FilterShowBottomButton"
+ android:src="@drawable/filtershow_button_colors_contrast"
+ android:text="@string/saturation" />
+
</LinearLayout>
</HorizontalScrollView>
</FrameLayout>
diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml
index 5023566..e953fa0 100644
--- a/res/values/filtershow_strings.xml
+++ b/res/values/filtershow_strings.xml
@@ -73,8 +73,10 @@
<string name="vibrance">Vibrance</string>
<!-- Label for the saturation filter button [CHAR LIMIT=15] -->
<string name="saturation">Saturation</string>
- <!-- Label for the tint filter button [CHAR LIMIT=15] -->
- <string name="tint">Tint</string>
+ <!-- Label for the White Balance filter button [CHAR LIMIT=15] -->
+ <string name="wbalance">White Balance</string>
+ <!-- Label for the Hue filter button [CHAR LIMIT=15] -->
+ <string name="hue">Hue</string>
<!-- Label for the shadow recovery filter button [CHAR LIMIT=15] -->
<string name="shadow_recovery">Shadows</string>
<!-- Label for the curves filter button [CHAR LIMIT=15] -->