am c23e8d86: am 07986225: am c82e65b4: Merge "Disable geometry button if tiny planet is here" into gb-ub-photos-carlsbad

* commit 'c23e8d862de72682f444f68fff3b1f30efcc21cd':
  Disable geometry button if tiny planet is here

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);
+    }
 }