diff options
author | nicolasroard <nicolasroard@google.com> | 2013-02-11 15:44:04 -0800 |
---|---|---|
committer | nicolasroard <nicolasroard@google.com> | 2013-02-11 15:44:04 -0800 |
commit | da1c8d757aad7f7f0077ff99283b3db98e2ea395 (patch) | |
tree | 9d0dda1a620b90c67de5e863cf07158e991ee3f5 /src | |
parent | c4447bec1e57d301739f37be3258ecc896edc595 (diff) | |
download | android_packages_apps_Snap-da1c8d757aad7f7f0077ff99283b3db98e2ea395.tar.gz android_packages_apps_Snap-da1c8d757aad7f7f0077ff99283b3db98e2ea395.tar.bz2 android_packages_apps_Snap-da1c8d757aad7f7f0077ff99283b3db98e2ea395.zip |
Move useFilterRepresentation to PanelController
Change-Id: I8abd9b2bd1b808df6a84e334b6eaa36b1c16750d
Diffstat (limited to 'src')
3 files changed, 28 insertions, 39 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index d29d5ebc1..f061842cd 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -714,7 +714,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, representation.setName(getString(representation.getTextId())); } String text = representation.getName(); - icon.setup(text, this, panel); + icon.setup(text, mPanelController, panel); icon.setFilterRepresentation(representation); if (representation instanceof FilterTinyPlanetRepresentation) { // needed to hide tinyplanet on startup @@ -983,30 +983,6 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, r.getDisplayMetrics()); } - public void useFilterRepresentation(FilterRepresentation filterRepresentation) { - if (filterRepresentation == null) { - return; - } - if (mMasterImage.getCurrentFilterRepresentation() == filterRepresentation) { - return; - } - ImagePreset oldPreset = mMasterImage.getPreset(); - ImagePreset copy = new ImagePreset(oldPreset); - FilterRepresentation representation = copy.getRepresentation(filterRepresentation); - if (representation == null) { - copy.addFilter(filterRepresentation); - } else { - if (filterRepresentation.allowsMultipleInstances()) { - representation.useParametersFrom(filterRepresentation); - copy.setHistoryName(filterRepresentation.getName()); - } - filterRepresentation = representation; - } - mMasterImage.setPreset(copy, true); - mMasterImage.setCurrentFilterRepresentation(filterRepresentation); - invalidateViews(); - } - @Override public void onItemClick(AdapterView<?> parent, View view, int position, long id) { diff --git a/src/com/android/gallery3d/filtershow/PanelController.java b/src/com/android/gallery3d/filtershow/PanelController.java index e4140141c..ce7216289 100644 --- a/src/com/android/gallery3d/filtershow/PanelController.java +++ b/src/com/android/gallery3d/filtershow/PanelController.java @@ -447,6 +447,29 @@ public class PanelController implements OnClickListener { */ } + public void useFilterRepresentation(FilterRepresentation filterRepresentation) { + if (filterRepresentation == null) { + return; + } + if (MasterImage.getImage().getCurrentFilterRepresentation() == filterRepresentation) { + return; + } + ImagePreset oldPreset = MasterImage.getImage().getPreset(); + ImagePreset copy = new ImagePreset(oldPreset); + FilterRepresentation representation = copy.getRepresentation(filterRepresentation); + if (representation == null) { + copy.addFilter(filterRepresentation); + } else { + if (filterRepresentation.allowsMultipleInstances()) { + representation.useParametersFrom(filterRepresentation); + copy.setHistoryName(filterRepresentation.getName()); + } + filterRepresentation = representation; + } + MasterImage.getImage().setPreset(copy, true); + MasterImage.getImage().setCurrentFilterRepresentation(filterRepresentation); + } + public void showComponent(View view) { boolean doPanelTransition = true; @@ -476,7 +499,6 @@ public class PanelController implements OnClickListener { if (view instanceof FilterIconButton) { mCurrentEditor = null; FilterIconButton component = (FilterIconButton) view; - ImageFilter filter = component.getImageFilter(); FilterRepresentation representation = component.getFilterRepresentation(); if (representation != null) { mUtilityPanel.setEffectName(representation.getName()); diff --git a/src/com/android/gallery3d/filtershow/ui/FilterIconButton.java b/src/com/android/gallery3d/filtershow/ui/FilterIconButton.java index 681574c5d..a753f46b9 100644 --- a/src/com/android/gallery3d/filtershow/ui/FilterIconButton.java +++ b/src/com/android/gallery3d/filtershow/ui/FilterIconButton.java @@ -25,6 +25,7 @@ import android.view.View; import android.widget.LinearLayout; import com.android.gallery3d.filtershow.FilterShowActivity; +import com.android.gallery3d.filtershow.PanelController; import com.android.gallery3d.filtershow.cache.FilteringPipeline; import com.android.gallery3d.filtershow.filters.FilterRepresentation; import com.android.gallery3d.filtershow.filters.FiltersManager; @@ -32,7 +33,7 @@ import com.android.gallery3d.filtershow.filters.ImageFilter; public class FilterIconButton extends IconButton implements View.OnClickListener { private Bitmap mOverlayBitmap = null; - private FilterShowActivity mController = null; + private PanelController mController = null; private ImageFilter mImageFilter = null; private FilterRepresentation mFilterRepresentation = null; private LinearLayout mParentContainer = null; @@ -50,7 +51,7 @@ public class FilterIconButton extends IconButton implements View.OnClickListener super(context, attrs, defStyle); } - public void setup(String text, FilterShowActivity controller, LinearLayout parent) { + public void setup(String text, PanelController controller, LinearLayout parent) { mController = controller; setText(text); mParentContainer = parent; @@ -58,12 +59,6 @@ public class FilterIconButton extends IconButton implements View.OnClickListener invalidate(); } - public void setup(String text, ImageFilter filter, FilterShowActivity controller, - LinearLayout parent) { - setup(text, controller, parent); - mImageFilter = filter; - } - @Override protected Bitmap drawImage(Bitmap dst, Bitmap image, Rect destination) { dst = super.drawImage(dst, image, destination); @@ -89,7 +84,7 @@ public class FilterIconButton extends IconButton implements View.OnClickListener @Override public void onClick(View v) { - if (mController != null && mImageFilter != null) { + if (mController != null) { mController.useFilterRepresentation(mFilterRepresentation); mParentContainer.dispatchSetSelected(false); setSelected(true); @@ -99,10 +94,6 @@ public class FilterIconButton extends IconButton implements View.OnClickListener } } - public ImageFilter getImageFilter() { - return mImageFilter; - } - public FilterRepresentation getFilterRepresentation() { return mFilterRepresentation; } |