Merge CAF branch 'LA.BR.1.2.1_rb2.19' into caf/cm-12.0.caf/cm-12.0

Change-Id: Ia3298d47deceb2f762909b71ece99b6b7c79dc27

4 files changed, 17 insertions, 7 deletions

diff --git a/src/com/android/gallery3d/app/GalleryAppImpl.java b/src/com/android/gallery3d/app/GalleryAppImpl.java
index c6e7a0b57..9c5f232df 100644
--- a/src/com/android/gallery3d/app/GalleryAppImpl.java
+++ b/src/com/android/gallery3d/app/GalleryAppImpl.java
@@ -36,6 +36,7 @@ public class GalleryAppImpl extends Application implements GalleryApp {
 
     private static final String DOWNLOAD_FOLDER = "download";
     private static final long DOWNLOAD_CAPACITY = 64 * 1024 * 1024; // 64M
+    private static GalleryAppImpl sGalleryAppImpl;
 
     private ImageCacheService mImageCacheService;
     private Object mLock = new Object();
@@ -51,6 +52,7 @@ public class GalleryAppImpl extends Application implements GalleryApp {
         WidgetUtils.initialize(this);
         PicasaSource.initialize(this);
         UsageStatistics.initialize(this);
+        sGalleryAppImpl = this;
     }
 
     @Override
@@ -58,6 +60,10 @@ public class GalleryAppImpl extends Application implements GalleryApp {
         return this;
     }
 
+    public static Context getContext() {
+        return sGalleryAppImpl;
+    }
+
     @Override
     public synchronized DataManager getDataManager() {
         if (mDataManager == null) {
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index 5b6933a13..f80b28e5c 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -481,7 +481,8 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
             }
         }
         if (!found) {
-            FilterRepresentation representation = new FilterDrawRepresentation();
+            FilterRepresentation representation =
+                    new FilterDrawRepresentation(getString(R.string.imageDraw));
             Action action = new Action(this, representation);
             action.setIsDoubleAction(true);
             mCategoryGeometryAdapter.add(action);
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
index 275a40409..5c5e561ca 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
@@ -157,10 +157,10 @@ public class FilterDrawRepresentation extends FilterRepresentation {
     private Vector<StrokeData> mDrawing = new Vector<StrokeData>();
     private StrokeData mCurrent; // used in the currently drawing style
 
-    public FilterDrawRepresentation() {
-        super("Draw");
+    public FilterDrawRepresentation(String name) {
+        super(name);
         setFilterClass(ImageFilterDraw.class);
-        setSerializationName("DRAW");
+        setSerializationName(name);
         setFilterType(FilterRepresentation.TYPE_VIGNETTE);
         setTextId(R.string.imageDraw);
         setEditorId(EditorDraw.ID);
@@ -190,7 +190,7 @@ public class FilterDrawRepresentation extends FilterRepresentation {
 
     @Override
     public FilterRepresentation copy() {
-        FilterDrawRepresentation representation = new FilterDrawRepresentation();
+        FilterDrawRepresentation representation = new FilterDrawRepresentation(getName());
         copyAllParameters(representation);
         return representation;
     }
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
index 8fd5b029e..da7de9379 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
@@ -29,6 +29,7 @@ import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
 
 import com.android.gallery3d.R;
+import com.android.gallery3d.app.GalleryAppImpl;
 import com.android.gallery3d.app.Log;
 import com.android.gallery3d.filtershow.cache.ImageLoader;
 import com.android.gallery3d.filtershow.filters.FilterDrawRepresentation.StrokeData;
@@ -47,7 +48,8 @@ public class ImageFilterDraw extends ImageFilter {
     int mCachedStrokes = -1;
     int mCurrentStyle = 0;
 
-    FilterDrawRepresentation mParameters = new FilterDrawRepresentation();
+    FilterDrawRepresentation mParameters = new FilterDrawRepresentation(
+            GalleryAppImpl.getContext().getString(R.string.imageDraw));
 
     public ImageFilterDraw() {
         mName = "Image Draw";
@@ -69,7 +71,8 @@ public class ImageFilterDraw extends ImageFilter {
 
     @Override
     public FilterRepresentation getDefaultRepresentation() {
-        return new FilterDrawRepresentation();
+        return new FilterDrawRepresentation(
+                GalleryAppImpl.getContext().getString(R.string.imageDraw));
     }
 
     @Override