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

Bug: 7344749
Bug: 7322949
Change-Id: Ia9ebc45fb2c743a458af270be429f07198ea3c1b

3 files changed, 17 insertions, 15 deletions

diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml
index 1bdabe025..d098dc89d 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"
diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml
index b4ff85f57..142a3a042 100644
--- a/res/values/filtershow_strings.xml
+++ b/res/values/filtershow_strings.xml
@@ -83,7 +83,7 @@
     <!--  Label for the exposure filter button [CHAR LIMIT=15] -->
     <string name="exposure">Exposure</string>
     <!--  Label for the sharpen filter button [CHAR LIMIT=15] -->
-    <string name="sharpen">Sharpen</string>
+    <string name="sharpness">Sharpness</string>
     <!--  Label for the contrast filter button [CHAR LIMIT=15] -->
     <string name="contrast">Contrast</string>
     <!--  Label for the vibrance filter button [CHAR LIMIT=15] -->
@@ -91,7 +91,7 @@
     <!--  Label for the saturation filter button [CHAR LIMIT=15] -->
     <string name="saturation">Saturation</string>
     <!--  Label for the White Balance filter button [CHAR LIMIT=15] -->
-    <string name="wbalance">White Balance</string>
+    <string name="wbalance">Autocolor</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] -->
@@ -109,7 +109,9 @@
     <!--  Label for the rotate effect [CHAR LIMIT=15] -->
     <string name="rotate" msgid="460017689320955494">Rotate</string>
     <!--  Label for the flip effect [CHAR LIMIT=15] -->
-    <string name="flip" msgid="2357692401826287480">Flip</string>
+    <string name="mirror">Mirror</string>
+    <!--  Label for the original [CHAR LIMIT=15] -->
+    <string name="none">None</string>
 
     <!--  Labels for the curves tool -->
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 51feb81ce..b6c47b2c8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -332,17 +332,17 @@
     <!-- String for filter filtershow_fx_0002_bleach [CHAR LIMIT=14] -->
     <string name="ffx_bleach">Bleach</string>
     <!-- String for filter filtershow_fx_0003_blue_crush [CHAR LIMIT=14] -->
-    <string name="ffx_blue_crush">Blue Crush</string>
+    <string name="ffx_blue_crush">Blue</string>
     <!-- String for filter filtershow_fx_0004_bw_contrast [CHAR LIMIT=14] -->
-    <string name="ffx_bw_contrast">BW Contrast</string>
+    <string name="ffx_bw_contrast">B/W</string>
     <!-- String for filter filtershow_fx_0005_punch [CHAR LIMIT=14] -->
     <string name="ffx_punch">Punch</string>
     <!-- String for filter filtershow_fx_0006_x_process [CHAR LIMIT=14] -->
     <string name="ffx_x_process">X Process</string>
     <!-- String for filter filtershow_fx_0007_washout [CHAR LIMIT=14] -->
-    <string name="ffx_washout">Washout</string>
+    <string name="ffx_washout">Latte</string>
     <!-- String for filter filtershow_fx_0008_washout_color [CHAR LIMIT=14] -->
-    <string name="ffx_washout_color">Washout Color</string>
+    <string name="ffx_washout_color">Litho</string>
 
     <!-- Toast message shown after we make some album(s) available offline [CHAR LIMIT=50] -->
     <plurals name="make_albums_available_offline">