diff options
author | Ruben Brunk <rubenbrunk@google.com> | 2013-06-17 14:32:37 -0700 |
---|---|---|
committer | Ruben Brunk <rubenbrunk@google.com> | 2013-06-17 14:41:32 -0700 |
commit | ebd3dbd2cea94c6cf1fd84c24de073f937b2fb3a (patch) | |
tree | 3fe44fbfa0b1e1ad23847bfa6b11bcc9272c8ad2 /src_pd | |
parent | 76f291f18c070345faa4ad8c32cd7705f737e5de (diff) | |
download | android_packages_apps_Gallery2-ebd3dbd2cea94c6cf1fd84c24de073f937b2fb3a.tar.gz android_packages_apps_Gallery2-ebd3dbd2cea94c6cf1fd84c24de073f937b2fb3a.tar.bz2 android_packages_apps_Gallery2-ebd3dbd2cea94c6cf1fd84c24de073f937b2fb3a.zip |
Added serialization IDs for frames, adds frames to analytics.
Bug: 9467671
Change-Id: I6f21e7bc9ca7255a290ba7cd1a94e9b07e7b06cb
Diffstat (limited to 'src_pd')
-rw-r--r-- | src_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java | 80 |
1 files changed, 63 insertions, 17 deletions
diff --git a/src_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java b/src_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java index 97588db1c..c5a6435aa 100644 --- a/src_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java +++ b/src_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java @@ -50,25 +50,71 @@ public class FiltersManager extends BaseFiltersManager { @Override public void addBorders(Context context, Vector<FilterRepresentation> representations) { + + // Do not localize + String[] serializationNames = { + "FRAME_4X5", + "FRAME_BRUSH", + "FRAME_GRUNGE", + "FRAME_SUMI_E", + "FRAME_TAPE", + "FRAME_BLACK", + "FRAME_BLACK_ROUNDED", + "FRAME_WHITE", + "FRAME_WHITE_ROUNDED", + "FRAME_CREAM", + "FRAME_CREAM_ROUNDED" + }; + + int i = 0; // Regular borders - representations.add(new FilterImageBorderRepresentation(R.drawable.filtershow_border_4x5)); - representations.add( - new FilterImageBorderRepresentation(R.drawable.filtershow_border_brush)); - representations.add( - new FilterImageBorderRepresentation(R.drawable.filtershow_border_grunge)); - representations.add( - new FilterImageBorderRepresentation(R.drawable.filtershow_border_sumi_e)); - representations.add(new FilterImageBorderRepresentation(R.drawable.filtershow_border_tape)); - representations.add(new FilterColorBorderRepresentation(Color.BLACK, mImageBorderSize, 0)); - representations.add(new FilterColorBorderRepresentation(Color.BLACK, mImageBorderSize, - mImageBorderSize)); - representations.add(new FilterColorBorderRepresentation(Color.WHITE, mImageBorderSize, 0)); - representations.add(new FilterColorBorderRepresentation(Color.WHITE, mImageBorderSize, - mImageBorderSize)); + FilterRepresentation rep = new FilterImageBorderRepresentation(R.drawable.filtershow_border_4x5); + rep.setSerializationName(serializationNames[i++]); + representations.add(rep); + + rep = new FilterImageBorderRepresentation(R.drawable.filtershow_border_brush); + rep.setSerializationName(serializationNames[i++]); + representations.add(rep); + + rep = new FilterImageBorderRepresentation(R.drawable.filtershow_border_grunge); + rep.setSerializationName(serializationNames[i++]); + representations.add(rep); + + rep = new FilterImageBorderRepresentation(R.drawable.filtershow_border_sumi_e); + rep.setSerializationName(serializationNames[i++]); + representations.add(rep); + + rep = new FilterImageBorderRepresentation(R.drawable.filtershow_border_tape); + rep.setSerializationName(serializationNames[i++]); + representations.add(rep); + + rep = new FilterColorBorderRepresentation(Color.BLACK, mImageBorderSize, 0); + rep.setSerializationName(serializationNames[i++]); + representations.add(rep); + + rep = new FilterColorBorderRepresentation(Color.BLACK, mImageBorderSize, + mImageBorderSize); + rep.setSerializationName(serializationNames[i++]); + representations.add(rep); + + rep = new FilterColorBorderRepresentation(Color.WHITE, mImageBorderSize, 0); + rep.setSerializationName(serializationNames[i++]); + representations.add(rep); + + rep = new FilterColorBorderRepresentation(Color.WHITE, mImageBorderSize, + mImageBorderSize); + rep.setSerializationName(serializationNames[i++]); + representations.add(rep); + int creamColor = Color.argb(255, 237, 237, 227); - representations.add(new FilterColorBorderRepresentation(creamColor, mImageBorderSize, 0)); - representations.add(new FilterColorBorderRepresentation(creamColor, mImageBorderSize, - mImageBorderSize)); + rep = new FilterColorBorderRepresentation(creamColor, mImageBorderSize, 0); + rep.setSerializationName(serializationNames[i++]); + representations.add(rep); + + rep = new FilterColorBorderRepresentation(creamColor, mImageBorderSize, + mImageBorderSize); + rep.setSerializationName(serializationNames[i++]); + representations.add(rep); } public static FiltersManager getHighresManager() { |