diff options
author | repo sync <hoford@google.com> | 2013-04-22 13:37:02 -0700 |
---|---|---|
committer | repo sync <hoford@google.com> | 2013-04-22 13:37:02 -0700 |
commit | cd2114728c5c9ea938aece6648ee3369fccccfcc (patch) | |
tree | b2df063da97c7832af167eabf622541b5a5eda4c /src/com/android | |
parent | 47c842458bfd94f9cc695459e64ebcc4c352c79e (diff) | |
parent | d81bba2275dc393278239aa1d5617d3d6a7bfe2a (diff) | |
download | android_packages_apps_Snap-cd2114728c5c9ea938aece6648ee3369fccccfcc.tar.gz android_packages_apps_Snap-cd2114728c5c9ea938aece6648ee3369fccccfcc.tar.bz2 android_packages_apps_Snap-cd2114728c5c9ea938aece6648ee3369fccccfcc.zip |
resolved conflicts for merge of a1939d22 to gb-ub-photos-carlsbad
Change-Id: Ic6759448c932823720021e85e1232736ff2085f8
Diffstat (limited to 'src/com/android')
5 files changed, 44 insertions, 29 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index f16ed1372..aa016763d 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -121,7 +121,6 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL private static final int SELECT_PICTURE = 1; private static final String LOGTAG = "FilterShowActivity"; protected static final boolean ANIMATE_PANELS = true; - private static int mImageBorderSize = 4; // in percent private boolean mShowingTinyPlanet = false; private boolean mShowingImageStatePanel = false; @@ -405,24 +404,8 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL borders.add(new FilterImageBorderRepresentation(0)); // Google-build borders - FiltersManager.getManager().addBorders(borders); - - // Regular borders - borders.add(new FilterImageBorderRepresentation(R.drawable.filtershow_border_4x5)); - borders.add(new FilterImageBorderRepresentation(R.drawable.filtershow_border_brush)); - borders.add(new FilterImageBorderRepresentation(R.drawable.filtershow_border_grunge)); - borders.add(new FilterImageBorderRepresentation(R.drawable.filtershow_border_sumi_e)); - borders.add(new FilterImageBorderRepresentation(R.drawable.filtershow_border_tape)); - borders.add(new FilterColorBorderRepresentation(Color.BLACK, mImageBorderSize, 0)); - borders.add(new FilterColorBorderRepresentation(Color.BLACK, mImageBorderSize, - mImageBorderSize)); - borders.add(new FilterColorBorderRepresentation(Color.WHITE, mImageBorderSize, 0)); - borders.add(new FilterColorBorderRepresentation(Color.WHITE, mImageBorderSize, - mImageBorderSize)); - int creamColor = Color.argb(255, 237, 237, 227); - borders.add(new FilterColorBorderRepresentation(creamColor, mImageBorderSize, 0)); - borders.add(new FilterColorBorderRepresentation(creamColor, mImageBorderSize, - mImageBorderSize)); + FiltersManager.getManager().addBorders(this, borders); + for (int i = 0; i < borders.size(); i++) { FilterRepresentation filter = borders.elementAt(i); filter.setScrName(getString(R.string.borders)); @@ -792,14 +775,11 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL mNullFxFilter.setSelected(true); Vector<FilterRepresentation> filtersRepresentations = new Vector<FilterRepresentation>(); - FiltersManager.getManager().addLooks(filtersRepresentations); + FiltersManager.getManager().addLooks(this, filtersRepresentations); for (FilterRepresentation representation : filtersRepresentations) { setupFilterRepresentationButton(representation, listFilters, button); } - for (int i = 0; i < p; i++) { - setupFilterRepresentationButton(fxArray[i], listFilters, button); - } } public void setDefaultPreset() { diff --git a/src/com/android/gallery3d/filtershow/PanelController.java b/src/com/android/gallery3d/filtershow/PanelController.java index e9a913610..2cd70e3aa 100644 --- a/src/com/android/gallery3d/filtershow/PanelController.java +++ b/src/com/android/gallery3d/filtershow/PanelController.java @@ -598,6 +598,7 @@ public class PanelController implements OnClickListener { mCurrentEditor = null; FilterIconButton component = (FilterIconButton) view; FilterRepresentation representation = component.getFilterRepresentation(); + if (representation != null) { mUtilityPanel.setEffectName(representation.getName()); mUtilityPanel.setShowParameter(representation.showParameterValue()); diff --git a/src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java b/src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java index e63323b92..8202d71bb 100644 --- a/src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java +++ b/src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java @@ -151,7 +151,6 @@ public class FilteringPipeline implements Handler.Callback { Log.e(LOGTAG, "setOriginal called after pipeline initialization!"); return; } - Log.v(LOGTAG,"setOriginal, size " + bitmap.getWidth() + " x " + bitmap.getHeight()); mAccessoryPipeline.setOriginal(bitmap); mPreviewPipeline.setOriginal(bitmap); mHighresPreviewPipeline.setOriginal(bitmap); diff --git a/src/com/android/gallery3d/filtershow/editors/ImageOnlyEditor.java b/src/com/android/gallery3d/filtershow/editors/ImageOnlyEditor.java index a3fc5aab4..d4e66edf8 100644 --- a/src/com/android/gallery3d/filtershow/editors/ImageOnlyEditor.java +++ b/src/com/android/gallery3d/filtershow/editors/ImageOnlyEditor.java @@ -26,7 +26,7 @@ import com.android.gallery3d.filtershow.imageshow.ImageShow; * The editor with no slider for filters without UI */ public class ImageOnlyEditor extends Editor { - public static int ID = R.id.imageOnlyEditor; + public final static int ID = R.id.imageOnlyEditor; private final String LOGTAG = "ImageOnlyEditor"; public ImageOnlyEditor() { @@ -37,6 +37,10 @@ public class ImageOnlyEditor extends Editor { super(id); } + public boolean useUtilityPanel() { + return false; + } + @Override public void createEditor(Context context, FrameLayout frameLayout) { super.createEditor(context, frameLayout); diff --git a/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java b/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java index 1a2150a1b..fc2cb1340 100644 --- a/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java +++ b/src/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java @@ -15,9 +15,12 @@ */ package com.android.gallery3d.filtershow.filters; +import android.content.Context; import android.content.res.Resources; import android.util.Log; + +import com.android.gallery3d.R; import com.android.gallery3d.filtershow.presets.ImagePreset; import java.util.HashMap; @@ -130,12 +133,40 @@ public abstract class BaseFiltersManager { filters.add(ImageFilterGeometry.class); } - public void addBorders(Vector<FilterRepresentation> representations) { - // Override + public void addBorders(Context context, Vector<FilterRepresentation> representations) { + } - public void addLooks(Vector<FilterRepresentation> representations) { - // Override + public void addLooks(Context context, Vector<FilterRepresentation> representations) { + int[] drawid = { + R.drawable.filtershow_fx_0005_punch, + R.drawable.filtershow_fx_0000_vintage, + R.drawable.filtershow_fx_0004_bw_contrast, + R.drawable.filtershow_fx_0002_bleach, + R.drawable.filtershow_fx_0001_instant, + R.drawable.filtershow_fx_0007_washout, + R.drawable.filtershow_fx_0003_blue_crush, + R.drawable.filtershow_fx_0008_washout_color, + R.drawable.filtershow_fx_0006_x_process + }; + + int[] fxNameid = { + R.string.ffx_punch, + R.string.ffx_vintage, + R.string.ffx_bw_contrast, + R.string.ffx_bleach, + R.string.ffx_instant, + R.string.ffx_washout, + R.string.ffx_blue_crush, + R.string.ffx_washout_color, + R.string.ffx_x_process + }; + + for (int i = 0; i < drawid.length; i++) { + FilterFxRepresentation fx = new FilterFxRepresentation( + context.getString(fxNameid[i]), drawid[i], fxNameid[i]); + representations.add(fx); + } } public void addEffects(Vector<FilterRepresentation> representations) { |