diff options
author | John Hoford <hoford@google.com> | 2012-10-10 14:17:30 -0700 |
---|---|---|
committer | John Hoford <hoford@google.com> | 2012-10-10 15:09:37 -0700 |
commit | ad4889c795c754b3e43da2ea744df20ed845ac85 (patch) | |
tree | 120c6e073ac20adfd5e0cab7fdd95ac6d160362a | |
parent | bc0be035a873a6cc4a99d2259ade5688af67bd9d (diff) | |
download | android_packages_apps_Snap-ad4889c795c754b3e43da2ea744df20ed845ac85.tar.gz android_packages_apps_Snap-ad4889c795c754b3e43da2ea744df20ed845ac85.tar.bz2 android_packages_apps_Snap-ad4889c795c754b3e43da2ea744df20ed845ac85.zip |
add White balance & disable UI elements
bug:7234321
Change-Id: Ic44bfe30b5d25e7d4442c4e6d4fd9e0e8410c7af
-rw-r--r-- | res/layout/filtershow_activity.xml | 32 | ||||
-rw-r--r-- | res/values/filtershow_strings.xml | 6 |
2 files changed, 24 insertions, 14 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> diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml index 50235669d..e953fa089 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] --> |