am 11a21df4: Merge "Fixed apply bar text. Moved strings to xml." into gb-ub-photos-arches

* commit '11a21df4be6984a180e27b9915a9d6af7e7ef359':
  Fixed apply bar text.  Moved strings to xml.

3 files changed, 44 insertions, 20 deletions

diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml
index 0c9ceb8a5..74173748e 100644
--- a/res/layout/filtershow_activity.xml
+++ b/res/layout/filtershow_activity.xml
@@ -187,6 +187,7 @@
                     android:layout_gravity="center"
                     android:layout_weight="1"
                     android:background="@android:color/transparent"
+                    android:textAllCaps="true"
                     android:gravity="center"
                     android:text="@string/apply_effect"
                     android:textSize="24dip" />
diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml
index e953fa089..e5d8b3f3f 100644
--- a/res/values/filtershow_strings.xml
+++ b/res/values/filtershow_strings.xml
@@ -83,8 +83,16 @@
     <string name="curvesRGB">Curves</string>
     <!--  Label for the vignette filter button [CHAR LIMIT=15] -->
     <string name="vignette">Vignette</string>
-    <!-- Name for the photo effect that removes redeye. [CHAR LIMIT=15] -->
+    <!--  Label for the photo effect that removes redeye. [CHAR LIMIT=15] -->
     <string name="redeye">Red Eye</string>
+    <!--  Label for the straighten effect [CHAR LIMIT=15] -->
+    <string name="straighten" msgid="5217801513491493491">Straighten</string>
+    <!--  Label for the crop effect [CHAR LIMIT=15] -->
+    <string name="crop" msgid="5584000454518174632">Crop</string>
+    <!--  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>
 
     <!--  Labels for the curves tool -->
 
@@ -97,4 +105,4 @@
     <!--  Label for the curves tool, Blue color channel [CHAR LIMIT=10] -->
     <string name="curves_channel_blue">Blue</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/src/com/android/gallery3d/filtershow/PanelController.java b/src/com/android/gallery3d/filtershow/PanelController.java
index d9205bf75..723f1ba45 100644
--- a/src/com/android/gallery3d/filtershow/PanelController.java
+++ b/src/com/android/gallery3d/filtershow/PanelController.java
@@ -142,10 +142,10 @@ public class PanelController implements OnClickListener {
         public void updateText() {
             String apply = mContext.getString(R.string.apply_effect);
             if (mShowParameterValue) {
-                mTextView.setText(Html.fromHtml(apply + ": <small>" + mEffectName + " "
-                        + mParameterValue + "</small>"));
+                mTextView.setText(Html.fromHtml(apply + ": " + mEffectName + " "
+                        + mParameterValue));
             } else {
-                mTextView.setText(Html.fromHtml(apply + ": <small>" + mEffectName + "</small>"));
+                mTextView.setText(Html.fromHtml(apply + ": " + mEffectName));
             }
         }
 
@@ -386,35 +386,41 @@ public class PanelController implements OnClickListener {
         switch (view.getId()) {
             case R.id.straightenButton: {
                 mCurrentImage = showImageView(R.id.imageStraighten);
-                mUtilityPanel.setEffectName("Straighten");
+                String ename = mCurrentImage.getContext().getString(R.string.straighten);
+                mUtilityPanel.setEffectName(ename);
                 break;
             }
             case R.id.cropButton: {
                 mCurrentImage = showImageView(R.id.imageCrop);
-                mUtilityPanel.setEffectName("Crop");
+                String ename = mCurrentImage.getContext().getString(R.string.crop);
+                mUtilityPanel.setEffectName(ename);
                 mUtilityPanel.showParameter(false);
                 break;
             }
             case R.id.rotateButton: {
                 mCurrentImage = showImageView(R.id.imageRotate);
-                mUtilityPanel.setEffectName("Rotate");
+                String ename = mCurrentImage.getContext().getString(R.string.rotate);
+                mUtilityPanel.setEffectName(ename);
                 break;
             }
             case R.id.flipButton: {
                 mCurrentImage = showImageView(R.id.imageFlip);
-                mUtilityPanel.setEffectName("Flip");
+                String ename = mCurrentImage.getContext().getString(R.string.flip);
+                mUtilityPanel.setEffectName(ename);
                 mUtilityPanel.showParameter(false);
                 break;
             }
             case R.id.vignetteButton: {
                 mCurrentImage = showImageView(R.id.imageShow).setShowControls(true);
-                mUtilityPanel.setEffectName("Vignette");
+                String ename = mCurrentImage.getContext().getString(R.string.vignette);
+                mUtilityPanel.setEffectName(ename);
                 ensureFilter("Vignette");
                 break;
             }
             case R.id.curvesButtonRGB: {
                 ImageCurves curves = (ImageCurves) showImageView(R.id.imageCurves);
-                mUtilityPanel.setEffectName("Curves");
+                String ename = mCurrentImage.getContext().getString(R.string.curvesRGB);
+                mUtilityPanel.setEffectName(ename);
                 curves.setUseRed(true);
                 curves.setUseGreen(true);
                 curves.setUseBlue(true);
@@ -424,55 +430,64 @@ public class PanelController implements OnClickListener {
             }
             case R.id.sharpenButton: {
                 mCurrentImage = showImageView(R.id.imageZoom).setShowControls(true);
-                mUtilityPanel.setEffectName("Sharpen");
+                String ename = mCurrentImage.getContext().getString(R.string.sharpen);
+                mUtilityPanel.setEffectName(ename);
                 ensureFilter("Sharpen");
                 break;
             }
             case R.id.contrastButton: {
                 mCurrentImage = showImageView(R.id.imageShow).setShowControls(true);
-                mUtilityPanel.setEffectName("Contrast");
+                String ename = mCurrentImage.getContext().getString(R.string.contrast);
+                mUtilityPanel.setEffectName(ename);
                 ensureFilter("Contrast");
                 break;
             }
             case R.id.saturationButton: {
                 mCurrentImage = showImageView(R.id.imageShow).setShowControls(true);
-                mUtilityPanel.setEffectName("Saturated");
+                String ename = mCurrentImage.getContext().getString(R.string.saturation);
+                mUtilityPanel.setEffectName(ename);
                 ensureFilter("Saturated");
                 break;
             }
             case R.id.wbalanceButton: {
                 mCurrentImage = showImageView(R.id.imageShow).setShowControls(false);
-                mUtilityPanel.setEffectName("White Balance");
+                String ename = mCurrentImage.getContext().getString(R.string.wbalance);
+                mUtilityPanel.setEffectName(ename);
                 ensureFilter("WBalance");
                 break;
             }
             case R.id.hueButton: {
                 mCurrentImage = showImageView(R.id.imageShow).setShowControls(true);
-                mUtilityPanel.setEffectName("Hue");
+                String ename = mCurrentImage.getContext().getString(R.string.hue);
+                mUtilityPanel.setEffectName(ename);
                 ensureFilter("Hue");
                 break;
             }
             case R.id.exposureButton: {
                 mCurrentImage = showImageView(R.id.imageShow).setShowControls(true);
-                mUtilityPanel.setEffectName("Exposure");
+                String ename = mCurrentImage.getContext().getString(R.string.exposure);
+                mUtilityPanel.setEffectName(ename);
                 ensureFilter("Exposure");
                 break;
             }
             case R.id.vibranceButton: {
                 mCurrentImage = showImageView(R.id.imageShow).setShowControls(true);
-                mUtilityPanel.setEffectName("Vibrance");
+                String ename = mCurrentImage.getContext().getString(R.string.vibrance);
+                mUtilityPanel.setEffectName(ename);
                 ensureFilter("Vibrance");
                 break;
             }
             case R.id.shadowRecoveryButton: {
                 mCurrentImage = showImageView(R.id.imageShow).setShowControls(true);
-                mUtilityPanel.setEffectName("Shadows");
+                String ename = mCurrentImage.getContext().getString(R.string.shadow_recovery);
+                mUtilityPanel.setEffectName(ename);
                 ensureFilter("Shadows");
                 break;
             }
             case R.id.redEyeButton: {
                 mCurrentImage = showImageView(R.id.imageShow).setShowControls(true);
-                mUtilityPanel.setEffectName("Redeye");
+                String ename = mCurrentImage.getContext().getString(R.string.redeye);
+                mUtilityPanel.setEffectName(ename);
                 ensureFilter("Redeye");
                 break;
             }