diff options
author | John Hoford <hoford@google.com> | 2013-01-14 14:48:39 -0800 |
---|---|---|
committer | John Hoford <hoford@google.com> | 2013-01-15 14:54:05 -0800 |
commit | 63a7dac01d394523799939596b960cb03321798d (patch) | |
tree | 7d320449489083a45f513935a35b8fe2102eda9f /src/com/android/gallery3d/filtershow/PanelController.java | |
parent | a4eee4927777ebeb81641ad9b95719578cb5df1d (diff) | |
download | android_packages_apps_Gallery2-63a7dac01d394523799939596b960cb03321798d.tar.gz android_packages_apps_Gallery2-63a7dac01d394523799939596b960cb03321798d.tar.bz2 android_packages_apps_Gallery2-63a7dac01d394523799939596b960cb03321798d.zip |
refactoring imageshow
Change-Id: I6d0872250b31a427ea6a3e46bd1c9ca5f3ba92ee
Diffstat (limited to 'src/com/android/gallery3d/filtershow/PanelController.java')
-rw-r--r-- | src/com/android/gallery3d/filtershow/PanelController.java | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/com/android/gallery3d/filtershow/PanelController.java b/src/com/android/gallery3d/filtershow/PanelController.java index 12fe5faea..9f49e89f5 100644 --- a/src/com/android/gallery3d/filtershow/PanelController.java +++ b/src/com/android/gallery3d/filtershow/PanelController.java @@ -18,6 +18,7 @@ package com.android.gallery3d.filtershow; import android.content.Context; import android.text.Html; +import android.util.Log; import android.view.View; import android.view.View.OnClickListener; import android.view.ViewPropertyAnimator; @@ -29,6 +30,7 @@ import com.android.gallery3d.filtershow.filters.ImageFilter; import com.android.gallery3d.filtershow.filters.ImageFilterTinyPlanet; import com.android.gallery3d.filtershow.imageshow.ImageCrop; import com.android.gallery3d.filtershow.imageshow.ImageShow; +import com.android.gallery3d.filtershow.imageshow.MasterImage; import com.android.gallery3d.filtershow.presets.ImagePreset; import com.android.gallery3d.filtershow.ui.FilterIconButton; import com.android.gallery3d.filtershow.ui.FramedTextButton; @@ -230,7 +232,7 @@ public class PanelController implements OnClickListener { private View mCurrentPanel = null; private View mRowPanel = null; private UtilityPanel mUtilityPanel = null; - private ImageShow mMasterImage = null; + private MasterImage mMasterImage = MasterImage.getImage(); private ImageShow mCurrentImage = null; private FilterShowActivity mActivity = null; @@ -287,7 +289,7 @@ public class PanelController implements OnClickListener { } HistoryAdapter adapter = mMasterImage.getHistory(); int position = adapter.undo(); - mMasterImage.onItemClick(position); + mMasterImage.onHistoryItemClick(position); showPanel(mCurrentPanel); mCurrentImage.select(); if (mDisableFilterButtons) { @@ -320,10 +322,6 @@ public class PanelController implements OnClickListener { accessoryViewList, textView); } - public void setMasterImage(ImageShow imageShow) { - mMasterImage = imageShow; - } - @Override public void onClick(View view) { ViewType type = mViews.get(view); @@ -392,7 +390,7 @@ public class PanelController implements OnClickListener { } public ImagePreset getImagePreset() { - return mMasterImage.getImagePreset(); + return mMasterImage.getPreset(); } public ImageFilter setImagePreset(ImageFilter filter, String name) { @@ -400,7 +398,7 @@ public class PanelController implements OnClickListener { copy.add(filter); copy.setHistoryName(name); copy.setIsFx(false); - mMasterImage.setImagePreset(copy); + mMasterImage.setPreset(copy, true); return filter; } @@ -413,7 +411,7 @@ public class PanelController implements OnClickListener { // to push it onto the history stack. ImagePreset copy = new ImagePreset(getImagePreset()); copy.setHistoryName(name); - mMasterImage.setImagePreset(copy); + mMasterImage.setPreset(copy, true); filter = copy.getFilter(name); } @@ -469,9 +467,7 @@ public class PanelController implements OnClickListener { mCurrentImage.openUtilityPanel(mUtilityPanel.mAccessoryViewList); } mUtilityPanel.setShowParameter(filter.showParameterValue()); - if (filter != null) { - mMasterImage.setCurrentFilter(filter); - } + mMasterImage.setCurrentFilter(filter); mCurrentImage.select(); } return; |