Fix to ensure visible history adapter strings are from xml.

Bug: 7379327
Change-Id: I5fcb6fec1e9abe05689dd3b9f4e70e518a9e09d1

diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml
index f6e4f4f..3862865 100644 (file)
--- a/res/values/filtershow_strings.xml
+++ b/res/values/filtershow_strings.xml
@@ -24,11 +24,18 @@
     <!--  String shown when we cannot load the image when starting the activity [CHAR LIMIT=NONE] -->
     <string name="cannot_load_image">Cannot load the image!</string>
     <!--  String displayed when showing the original image [CHAR LIMIT=NONE] -->
-    <string name="original_picture_text">Original</string>
+    <string name="original_picture_text">@string/original</string>
+
+    <!--  generic strings -->
+
+    <!--  Text for original image [CHAR LIMIT=20] -->
+    <string name="original">Original</string>
+    <!--  Text for filters that apply a border to a picture [CHAR LIMIT=20] -->
+    <string name="borders" msgid="4461692156695893616">Borders</string>
 
     <!--  actionbar menu -->
 
-    <!-- Text for the actionbar confirmation button [CHAR LIMIT=20] -->
+    <!--  Text for the actionbar confirmation button [CHAR LIMIT=20] -->
     <string name="done">Done</string>
     <!--  Text for the undo menu item [CHAR LIMIT=20] -->
     <string name="filtershow_undo">Undo</string>
@@ -51,6 +58,8 @@
     <string name="history">History</string>
     <!--  Text for the history panel reset button [CHAR LIMIT=20]-->
     <string name="reset">Reset</string>
+    <!--  Text for the original image[CHAR LIMIT=20]-->
+    <string name="history_original">@string/original</string>
 
     <!--  Image state panel -->
 
@@ -78,7 +87,7 @@
     <!--  Label for the aspect None effect [CHAR LIMIT=15] -->
     <string name="aspectNone_effect">None</string>
     <!--  Label for the aspect None effect [CHAR LIMIT=15] -->
-    <string name="aspectOriginal_effect">Original</string>
+    <string name="aspectOriginal_effect">@string/original</string>
     <!--  Label for the tuny planet effect [CHAR LIMIT=10] -->
     <string name="tinyplanet">Tiny Planet</string>
 

diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index 3d96886..7a7645a 100644 (file)
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -558,7 +558,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
                 R.string.ffx_x_process
         };
 
-        ImagePreset preset = new ImagePreset(); // empty
+        ImagePreset preset = new ImagePreset(getString(R.string.history_original)); // empty
         preset.setImageLoader(mImageLoader);
         ImageSmallFilter filter = new ImageSmallFilter(this);
 
@@ -614,6 +614,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
         ImageSmallFilter previousFilter = null;
         for (int i = 0; i < p; i++) {
             ImageSmallBorder filter = new ImageSmallBorder(this);
+            borders[i].setName(getString(R.string.borders));
             filter.setImageFilter(borders[i]);
             filter.setController(this);
             filter.setBorder(true);

diff --git a/src/com/android/gallery3d/filtershow/HistoryAdapter.java b/src/com/android/gallery3d/filtershow/HistoryAdapter.java
index 684c2fc..d938c5a 100644 (file)
--- a/src/com/android/gallery3d/filtershow/HistoryAdapter.java
+++ b/src/com/android/gallery3d/filtershow/HistoryAdapter.java
@@ -18,6 +18,11 @@ import java.util.Vector;
 public class HistoryAdapter extends ArrayAdapter<ImagePreset> {
     private static final String LOGTAG = "HistoryAdapter";
     private int mCurrentPresetPosition = 0;
+    private String mBorders = null;
+    private String mCrop = null;
+    private String mRotate = null;
+    private String mStraighten = null;
+    private String mMirror = null;
     private MenuItem mUndoMenuItem = null;
     private MenuItem mRedoMenuItem = null;
     private MenuItem mResetMenuItem = null;
@@ -25,6 +30,11 @@ public class HistoryAdapter extends ArrayAdapter<ImagePreset> {
     public HistoryAdapter(Context context, int resource, int textViewResourceId) {
         super(context, resource, textViewResourceId);
         FilterShowActivity activity = (FilterShowActivity) context;
+        mBorders = context.getString(R.string.borders);
+        mCrop = context.getString(R.string.crop);
+        mRotate = context.getString(R.string.rotate);
+        mStraighten = context.getString(R.string.straighten);
+        mMirror = context.getString(R.string.mirror);
     }
 
     public void setMenuItems(MenuItem undoItem, MenuItem redoItem, MenuItem resetItem) {
@@ -176,17 +186,17 @@ public class HistoryAdapter extends ArrayAdapter<ImagePreset> {
             // TODO: use type of last filter, not a string, to discriminate.
             if (position == getCount() - 1) {
                 typeView.setImageResource(R.drawable.ic_photoeditor_effects);
-            } else if (item.historyName().equalsIgnoreCase("Border")) {
+            } else if (item.historyName().equalsIgnoreCase(mBorders)) {
                 typeView.setImageResource(R.drawable.ic_photoeditor_border);
-            } else if (item.historyName().equalsIgnoreCase("Straighten")) {
+            } else if (item.historyName().equalsIgnoreCase(mStraighten)) {
                 typeView.setImageResource(R.drawable.ic_photoeditor_fix);
-            } else if (item.historyName().equalsIgnoreCase("Crop")) {
+            } else if (item.historyName().equalsIgnoreCase(mCrop)) {
                 typeView.setImageResource(R.drawable.ic_photoeditor_fix);
-            } else if (item.historyName().equalsIgnoreCase("Rotation")) {
+            } else if (item.historyName().equalsIgnoreCase(mRotate)) {
                 typeView.setImageResource(R.drawable.ic_photoeditor_fix);
-            } else if (item.historyName().equalsIgnoreCase("Mirror")) {
+            } else if (item.historyName().equalsIgnoreCase(mMirror)) {
                 typeView.setImageResource(R.drawable.ic_photoeditor_fix);
-           } else if (item.isFx()) {
+            } else if (item.isFx()) {
                 typeView.setImageResource(R.drawable.ic_photoeditor_effects);
             } else {
                 typeView.setImageResource(R.drawable.ic_photoeditor_color);

diff --git a/src/com/android/gallery3d/filtershow/PanelController.java b/src/com/android/gallery3d/filtershow/PanelController.java
index 45ee235..2fbd831 100644 (file)
--- a/src/com/android/gallery3d/filtershow/PanelController.java
+++ b/src/com/android/gallery3d/filtershow/PanelController.java
@@ -490,6 +490,7 @@ public class PanelController implements OnClickListener {
     public ImageFilter setImagePreset(ImageFilter filter, String name) {
         ImagePreset copy = new ImagePreset(getImagePreset());
         copy.add(filter);
+        copy.setHistoryName(name);
         copy.setIsFx(false);
         mMasterImage.setImagePreset(copy);
         return filter;

diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java b/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
index a57868c..c740977 100644 (file)
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
@@ -87,7 +87,7 @@ public class ImageCrop extends ImageGeometry {
 
     @Override
     public String getName() {
-        return "Crop";
+        return getContext().getString(R.string.crop);
     }
 
     private boolean switchCropBounds(int moving_corner, RectF dst) {

diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageFlip.java b/src/com/android/gallery3d/filtershow/imageshow/ImageFlip.java
index f6cd9b7..931ef86 100644 (file)
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageFlip.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageFlip.java
@@ -23,6 +23,7 @@ import android.graphics.Paint;
 import android.graphics.RectF;
 import android.util.AttributeSet;
 
+import com.android.gallery3d.R;
 import com.android.gallery3d.filtershow.imageshow.GeometryMetadata.FLIP;
 
 public class ImageFlip extends ImageGeometry {
@@ -42,7 +43,7 @@ public class ImageFlip extends ImageGeometry {
 
     @Override
     public String getName() {
-        return "Mirror";
+        return getContext().getString(R.string.mirror);
     }
 
     @Override

diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageRotate.java b/src/com/android/gallery3d/filtershow/imageshow/ImageRotate.java
index c88e51d..0d458ca 100644 (file)
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageRotate.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageRotate.java
@@ -22,6 +22,8 @@ import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.util.AttributeSet;
 
+import com.android.gallery3d.R;
+
 public class ImageRotate extends ImageGeometry {
 
     private float mBaseAngle = 0;
@@ -40,7 +42,7 @@ public class ImageRotate extends ImageGeometry {
 
     @Override
     public String getName() {
-        return "Rotation";
+        return getContext().getString(R.string.rotate);
     }
 
     private static final Paint gPaint = new Paint();

diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java b/src/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
index 4f29c0f..0f70b23 100644 (file)
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
@@ -24,6 +24,8 @@ import android.graphics.Path;
 import android.graphics.RectF;
 import android.util.AttributeSet;
 
+import com.android.gallery3d.R;
+
 public class ImageStraighten extends ImageGeometry {
 
     private float mBaseAngle = 0;
@@ -42,7 +44,7 @@ public class ImageStraighten extends ImageGeometry {
 
     @Override
     public String getName() {
-        return "Straighten";
+        return getContext().getString(R.string.straighten);
     }
 
     @Override

diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
index 83e7c12..cbb1430 100644 (file)
--- a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
+++ b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
@@ -24,7 +24,7 @@ public class ImagePreset {
 
     protected Vector<ImageFilter> mFilters = new Vector<ImageFilter>();
     protected String mName = "Original";
-    protected String mHistoryName = "Original";
+    private String mHistoryName = "Original";
     protected boolean mIsFxPreset = false;
 
     public final GeometryMetadata mGeoData = new GeometryMetadata();
@@ -37,6 +37,11 @@ public class ImagePreset {
         setup();
     }
 
+    public ImagePreset(String historyName) {
+        setHistoryName(historyName);
+        setup();
+    }
+
     public ImagePreset(ImagePreset source, String historyName) {
         this(source);
         if (historyName != null) {
@@ -172,7 +177,7 @@ public class ImagePreset {
     public void add(ImageFilter filter) {
 
         if (filter.getFilterType() == ImageFilter.TYPE_BORDER) {
-            setHistoryName("Border");
+            setHistoryName(filter.getName());
             setBorder(filter);
         } else if (filter.getFilterType() == ImageFilter.TYPE_FX) {
             boolean found = false;