diff options
author | nicolasroard <nicolasroard@google.com> | 2013-11-01 18:43:02 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-01 18:43:02 -0700 |
commit | c23e8d862de72682f444f68fff3b1f30efcc21cd (patch) | |
tree | a2ead82273f81c006df3c0097400de97c891d5e4 | |
parent | d5dbfe7b0336ef2349dd2ca321ae4cc51cb8b1ff (diff) | |
parent | 07986225643c5bccb472821ef68f7c285bd9fa58 (diff) | |
download | android_packages_apps_Gallery2-c23e8d862de72682f444f68fff3b1f30efcc21cd.tar.gz android_packages_apps_Gallery2-c23e8d862de72682f444f68fff3b1f30efcc21cd.tar.bz2 android_packages_apps_Gallery2-c23e8d862de72682f444f68fff3b1f30efcc21cd.zip |
am 07986225: am c82e65b4: Merge "Disable geometry button if tiny planet is here" into gb-ub-photos-carlsbad
* commit '07986225643c5bccb472821ef68f7c285bd9fa58':
Disable geometry button if tiny planet is here
-rw-r--r-- | src/com/android/gallery3d/filtershow/category/MainPanel.java | 4 | ||||
-rw-r--r-- | src/com/android/gallery3d/filtershow/imageshow/MasterImage.java | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/filtershow/category/MainPanel.java b/src/com/android/gallery3d/filtershow/category/MainPanel.java index eb1ce2b0f..082bf143a 100644 --- a/src/com/android/gallery3d/filtershow/category/MainPanel.java +++ b/src/com/android/gallery3d/filtershow/category/MainPanel.java @@ -27,6 +27,7 @@ import android.widget.LinearLayout; import com.android.gallery3d.R; import com.android.gallery3d.filtershow.FilterShowActivity; +import com.android.gallery3d.filtershow.imageshow.MasterImage; import com.android.gallery3d.filtershow.state.StatePanel; public class MainPanel extends Fragment { @@ -176,6 +177,9 @@ public class MainPanel extends Fragment { if (mCurrentSelected == GEOMETRY) { return; } + if (MasterImage.getImage().hasTinyPlanet()) { + return; + } boolean fromRight = isRightAnimation(GEOMETRY); selection(mCurrentSelected, false); CategoryPanel categoryPanel = new CategoryPanel(); diff --git a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java index 3513ded12..f6b97f11f 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java +++ b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java @@ -829,4 +829,8 @@ public class MasterImage implements RenderingRequestCaller { public BitmapCache getBitmapCache() { return mBitmapCache; } + + public boolean hasTinyPlanet() { + return mPreset.contains(FilterRepresentation.TYPE_TINYPLANET); + } } |