diff options
| author | nicolasroard <nicolasroard@google.com> | 2013-02-21 15:52:49 -0800 |
|---|---|---|
| committer | nicolasroard <nicolasroard@google.com> | 2013-02-21 17:43:58 -0800 |
| commit | a5fadcfd9faca04fed5c41669fe3895d1ac9c283 (patch) | |
| tree | 591523332cdd4c67911f63c195def8ac0d7083ae /src/com/android/gallery3d/filtershow/PanelController.java | |
| parent | c619b9510f048f5aab7ae3b2a1482e695dc6cfd7 (diff) | |
| download | android_packages_apps_Snap-a5fadcfd9faca04fed5c41669fe3895d1ac9c283.tar.gz android_packages_apps_Snap-a5fadcfd9faca04fed5c41669fe3895d1ac9c283.tar.bz2 android_packages_apps_Snap-a5fadcfd9faca04fed5c41669fe3895d1ac9c283.zip | |
Pinch to zoom refine
Change-Id: I538defa55a4ed898dd7c936ec813f052ac1b9e0a
Diffstat (limited to 'src/com/android/gallery3d/filtershow/PanelController.java')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/PanelController.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/gallery3d/filtershow/PanelController.java b/src/com/android/gallery3d/filtershow/PanelController.java index cff07ff61..5bda246da 100644 --- a/src/com/android/gallery3d/filtershow/PanelController.java +++ b/src/com/android/gallery3d/filtershow/PanelController.java @@ -375,11 +375,13 @@ public class PanelController implements OnClickListener { ImageShow image = null; mActivity.hideImageViews(); for (View view : mImageViews) { + image = (ImageShow) view; if (view.getId() == id) { view.setVisibility(View.VISIBLE); - image = (ImageShow) view; + image.select(); } else { view.setVisibility(View.GONE); + image.unselect(); } } return image; @@ -498,7 +500,7 @@ public class PanelController implements OnClickListener { } mUtilityPanel.hideAccessoryViews(); - if (view instanceof FilterIconButton) { + if (view instanceof FilterIconButton && view.getId() != R.id.applyEffect) { mCurrentEditor = null; FilterIconButton component = (FilterIconButton) view; FilterRepresentation representation = component.getFilterRepresentation(); @@ -555,8 +557,8 @@ public class PanelController implements OnClickListener { if (mCurrentImage instanceof ImageCrop && mUtilityPanel.firstTimeCropDisplayed) { ((ImageCrop) mCurrentImage).clear(); mUtilityPanel.firstTimeCropDisplayed = false; + ((ImageCrop) mCurrentImage).setFixedAspect(mFixedAspect); } - ((ImageCrop) mCurrentImage).setFixedAspect(mFixedAspect); break; } case R.id.rotateButton: { |