From 9b799fa7ccb6c5c926d13c7265af621b9eca3b33 Mon Sep 17 00:00:00 2001 From: John Hoford Date: Fri, 12 Jul 2013 15:31:09 -0700 Subject: fix restoring frames Change-Id: I77a75f3feb8a1affdb579e3c7b196928af1b2bf0 --- .../filtershow/filters/FiltersManager.java | 46 +++++++++++----------- 1 file changed, 24 insertions(+), 22 deletions(-) (limited to 'src_pd') diff --git a/src_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java b/src_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java index d4035cdce..66372c27f 100644 --- a/src_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java +++ b/src_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java @@ -22,6 +22,10 @@ import android.graphics.Color; import com.android.gallery3d.R; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Vector; + public class FiltersManager extends BaseFiltersManager { private static FiltersManager sInstance = null; private static FiltersManager sPreviewInstance = null; @@ -69,53 +73,51 @@ public class FiltersManager extends BaseFiltersManager { mBorders.add(rep); // Regular borders + ArrayList borderList = new ArrayList(); + + rep = new FilterImageBorderRepresentation(R.drawable.filtershow_border_4x5); - rep.setSerializationName(serializationNames[i++]); - mBorders.add(rep); + borderList.add(rep); rep = new FilterImageBorderRepresentation(R.drawable.filtershow_border_brush); - rep.setSerializationName(serializationNames[i++]); - mBorders.add(rep); + borderList.add(rep); rep = new FilterImageBorderRepresentation(R.drawable.filtershow_border_grunge); - rep.setSerializationName(serializationNames[i++]); - mBorders.add(rep); + borderList.add(rep); rep = new FilterImageBorderRepresentation(R.drawable.filtershow_border_sumi_e); - rep.setSerializationName(serializationNames[i++]); - mBorders.add(rep); + borderList.add(rep); rep = new FilterImageBorderRepresentation(R.drawable.filtershow_border_tape); - rep.setSerializationName(serializationNames[i++]); - mBorders.add(rep); + borderList.add(rep); rep = new FilterColorBorderRepresentation(Color.BLACK, mImageBorderSize, 0); - rep.setSerializationName(serializationNames[i++]); - mBorders.add(rep); + borderList.add(rep); rep = new FilterColorBorderRepresentation(Color.BLACK, mImageBorderSize, mImageBorderSize); - rep.setSerializationName(serializationNames[i++]); - mBorders.add(rep); + borderList.add(rep); rep = new FilterColorBorderRepresentation(Color.WHITE, mImageBorderSize, 0); - rep.setSerializationName(serializationNames[i++]); - mBorders.add(rep); + borderList.add(rep); rep = new FilterColorBorderRepresentation(Color.WHITE, mImageBorderSize, mImageBorderSize); - rep.setSerializationName(serializationNames[i++]); - mBorders.add(rep); + borderList.add(rep); int creamColor = Color.argb(255, 237, 237, 227); rep = new FilterColorBorderRepresentation(creamColor, mImageBorderSize, 0); - rep.setSerializationName(serializationNames[i++]); - mBorders.add(rep); + borderList.add(rep); rep = new FilterColorBorderRepresentation(creamColor, mImageBorderSize, mImageBorderSize); - rep.setSerializationName(serializationNames[i++]); - mBorders.add(rep); + borderList.add(rep); + + for (FilterRepresentation filter : borderList) { + filter.setSerializationName(serializationNames[i++]); + addRepresentation(filter); + } + } public static FiltersManager getHighresManager() { -- cgit v1.2.3