commit c82e65b4f05ae7ad1e910e84ebf8ba65e6afb3bd
author nicolasroard <nicolasroard@google.com> Sat Nov 02 01:37:30 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Nov 02 01:37:31 2013 +0000
tree 29b7d6dc3ccc55c7d782749207436fca81b20899
parent c0c6f058d464be3e4d6925239bcabc5b56fbce80
parent c870104ac3768bd528798eb4646c3b075757c5ff

Merge "Disable geometry button if tiny planet is here" into gb-ub-photos-carlsbad

src/com/android/gallery3d/filtershow/category/MainPanel.java

diff --git a/src/com/android/gallery3d/filtershow/category/MainPanel.java b/src/com/android/gallery3d/filtershow/category/MainPanel.java
index eb1ce2b..082bf14 100644
--- a/src/com/android/gallery3d/filtershow/category/MainPanel.java
+++ b/src/com/android/gallery3d/filtershow/category/MainPanel.java
@@ -27,6 +27,7 @@
 
 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 @@
         if (mCurrentSelected == GEOMETRY) {
             return;
         }
+        if (MasterImage.getImage().hasTinyPlanet()) {
+            return;
+        }
         boolean fromRight = isRightAnimation(GEOMETRY);
         selection(mCurrentSelected, false);
         CategoryPanel categoryPanel = new CategoryPanel();

src/com/android/gallery3d/filtershow/imageshow/MasterImage.java

diff --git a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
index 3513ded..f6b97f1 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
@@ -829,4 +829,8 @@
     public BitmapCache getBitmapCache() {
         return mBitmapCache;
     }
+
+    public boolean hasTinyPlanet() {
+        return mPreset.contains(FilterRepresentation.TYPE_TINYPLANET);
+    }
 }