commit ced4d2716a1346271d5a91bc675d0d3ee4dca2f9
author Ruben Brunk <rubenbrunk@google.com> Wed Oct 17 03:29:08 2012 -0700
committer Ruben Brunk <rubenbrunk@google.com> Wed Oct 17 16:11:52 2012 -0700
tree a8b22d120fe7b4704a9284c474c94ccdb5329fa5
parent aa9567d8f377fee9dbbcd8bb23a9cc3a2989ca48

Moved many strings to xml. Changed UI filter order. Renamed things.

Bug: 7344749
Bug: 7322949
Change-Id: Ia9ebc45fb2c743a458af270be429f07198ea3c1b

res/layout/filtershow_activity.xml

diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml
index 1bdabe0..d098dc8 100644
--- a/res/layout/filtershow_activity.xml
+++ b/res/layout/filtershow_activity.xml
@@ -291,7 +291,7 @@
                         android:id="@+id/flipButton"
                         style="@style/FilterShowBottomButton"
                         android:src="@drawable/filtershow_button_geometry_flip"
-                        android:text="@string/flip" />
+                        android:text="@string/mirror" />
 
                     <com.android.gallery3d.filtershow.ui.ImageButtonTitle
                         android:id="@+id/redEyeButton"
@@ -331,10 +331,10 @@
                         android:text="@string/exposure" />
 
                     <com.android.gallery3d.filtershow.ui.ImageButtonTitle
-                        android:id="@+id/vibranceButton"
+                        android:id="@+id/vignetteButton"
                         style="@style/FilterShowBottomButton"
-                        android:src="@drawable/filtershow_button_colors_contrast"
-                        android:text="@string/vibrance" />
+                        android:src="@drawable/filtershow_button_colors_vignette"
+                        android:text="@string/vignette" />
 
                     <com.android.gallery3d.filtershow.ui.ImageButtonTitle
                         android:id="@+id/contrastButton"
@@ -349,16 +349,16 @@
                         android:text="@string/shadow_recovery" />
 
                     <com.android.gallery3d.filtershow.ui.ImageButtonTitle
-                        android:id="@+id/vignetteButton"
+                        android:id="@+id/vibranceButton"
                         style="@style/FilterShowBottomButton"
-                        android:src="@drawable/filtershow_button_colors_vignette"
-                        android:text="@string/vignette" />
+                        android:src="@drawable/filtershow_button_colors_contrast"
+                        android:text="@string/vibrance" />
 
                     <com.android.gallery3d.filtershow.ui.ImageButtonTitle
                         android:id="@+id/sharpenButton"
                         style="@style/FilterShowBottomButton"
                         android:src="@drawable/filtershow_button_colors_sharpen"
-                        android:text="@string/sharpen" />
+                        android:text="@string/sharpness" />
 
                     <com.android.gallery3d.filtershow.ui.ImageButtonTitle
                         android:id="@+id/curvesButtonRGB"