diff options
author | John Hoford <hoford@google.com> | 2013-03-01 21:31:50 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-01 21:31:51 +0000 |
commit | 86d9386787c95ac8c98b661e69c458aa8de0e02a (patch) | |
tree | ca0877270a55782436a616d134aeec5cf32070c0 | |
parent | 6af159148657ac1c10652a29ae415b14d5a41930 (diff) | |
parent | 82148a5664f7d14712c6e9d5d7bb9d2a6374304e (diff) | |
download | android_packages_apps_Snap-86d9386787c95ac8c98b661e69c458aa8de0e02a.tar.gz android_packages_apps_Snap-86d9386787c95ac8c98b661e69c458aa8de0e02a.tar.bz2 android_packages_apps_Snap-86d9386787c95ac8c98b661e69c458aa8de0e02a.zip |
Merge "fixed hiding of tiny planet" into gb-ub-photos-bryce
3 files changed, 20 insertions, 22 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index a1c301f7d..34c5fe61f 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -335,7 +335,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, filters.setVisibility(View.INVISIBLE); loading.setVisibility(View.VISIBLE); - View tinyPlanetView = findViewById(R.id.tinyplanetButton); + View tinyPlanetView = findViewById(EditorTinyPlanet.ID); if (tinyPlanetView != null) { tinyPlanetView.setVisibility(View.GONE); } diff --git a/src/com/android/gallery3d/filtershow/PanelController.java b/src/com/android/gallery3d/filtershow/PanelController.java index 519733e08..58aded671 100644 --- a/src/com/android/gallery3d/filtershow/PanelController.java +++ b/src/com/android/gallery3d/filtershow/PanelController.java @@ -16,7 +16,6 @@ package com.android.gallery3d.filtershow; -import android.annotation.TargetApi; import android.content.Context; import android.text.Html; import android.view.View; @@ -27,11 +26,10 @@ import android.widget.TextView; import com.android.gallery3d.R; import com.android.gallery3d.filtershow.editors.Editor; +import com.android.gallery3d.filtershow.editors.EditorTinyPlanet; import com.android.gallery3d.filtershow.filters.FilterRepresentation; 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.ImageGeometry; import com.android.gallery3d.filtershow.imageshow.ImageShow; import com.android.gallery3d.filtershow.imageshow.MasterImage; import com.android.gallery3d.filtershow.presets.ImagePreset; @@ -525,21 +523,21 @@ public class PanelController implements OnClickListener { return; } - switch (view.getId()) { - case R.id.tinyplanetButton: { - mCurrentImage = showImageView(R.id.imageTinyPlanet); - String ename = mCurrentImage.getContext().getString(R.string.tinyplanet); - mUtilityPanel.setEffectName(ename); - break; - } - case R.id.applyEffect: { + int id = view.getId(); + if (id == EditorTinyPlanet.ID) { + mCurrentImage = showImageView(R.id.imageTinyPlanet); + String ename = mCurrentImage.getContext().getString(R.string.tinyplanet); + mUtilityPanel.setEffectName(ename); + + } else { + if (id == R.id.applyEffect) { if (MasterImage.getImage().getCurrentFilter() instanceof ImageFilterTinyPlanet) { mActivity.saveImage(); } else { showPanel(mCurrentPanel); } MasterImage.getImage().invalidateFiltersOnly(); - break; + } } mCurrentImage.select(); diff --git a/src/com/android/gallery3d/filtershow/imageshow/EclipseControl.java b/src/com/android/gallery3d/filtershow/imageshow/EclipseControl.java index a2a2e8568..a3296779e 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/EclipseControl.java +++ b/src/com/android/gallery3d/filtershow/imageshow/EclipseControl.java @@ -46,15 +46,15 @@ public class EclipseControl { private float mDownRadiusY; private Matrix mScrToImg; - private final static int HAN_CENTER = 0; - private final static int HAN_NORTH = 7; - private final static int HAN_NE = 8; - private final static int HAN_EAST = 1; - private final static int HAN_SE = 2; - private final static int HAN_SOUTH = 3; - private final static int HAN_SW = 4; - private final static int HAN_WEST = 5; - private final static int HAN_NW = 6; + public final static int HAN_CENTER = 0; + public final static int HAN_NORTH = 7; + public final static int HAN_NE = 8; + public final static int HAN_EAST = 1; + public final static int HAN_SE = 2; + public final static int HAN_SOUTH = 3; + public final static int HAN_SW = 4; + public final static int HAN_WEST = 5; + public final static int HAN_NW = 6; public EclipseControl(Context context) { mSliderColor = context.getResources().getColor(R.color.slider_line_color); |