summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authornicolasroard <nicolasroard@google.com>2013-11-01 16:03:35 -0700
committernicolasroard <nicolasroard@google.com>2013-11-01 16:03:35 -0700
commitc870104ac3768bd528798eb4646c3b075757c5ff (patch)
treec4d0e38e54e3ec58ebdff780cbc0b2e0adf93b11 /src/com/android
parent21b619541d6a92d595bbe6e95d4a0b46b6f40f77 (diff)
downloadandroid_packages_apps_Gallery2-c870104ac3768bd528798eb4646c3b075757c5ff.tar.gz
android_packages_apps_Gallery2-c870104ac3768bd528798eb4646c3b075757c5ff.tar.bz2
android_packages_apps_Gallery2-c870104ac3768bd528798eb4646c3b075757c5ff.zip
Disable geometry button if tiny planet is here
bug:11288853 Change-Id: I818f406eb25e0f82c89ffde0bd91d2aa8ab31b94
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/gallery3d/filtershow/category/MainPanel.java4
-rw-r--r--src/com/android/gallery3d/filtershow/imageshow/MasterImage.java4
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);
+ }
}