diff options
author | nicolasroard <nicolasroard@google.com> | 2013-11-02 01:37:30 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-02 01:37:31 +0000 |
commit | c82e65b4f05ae7ad1e910e84ebf8ba65e6afb3bd (patch) | |
tree | 29b7d6dc3ccc55c7d782749207436fca81b20899 /src | |
parent | c0c6f058d464be3e4d6925239bcabc5b56fbce80 (diff) | |
parent | c870104ac3768bd528798eb4646c3b075757c5ff (diff) | |
download | android_packages_apps_Gallery2-c82e65b4f05ae7ad1e910e84ebf8ba65e6afb3bd.tar.gz android_packages_apps_Gallery2-c82e65b4f05ae7ad1e910e84ebf8ba65e6afb3bd.tar.bz2 android_packages_apps_Gallery2-c82e65b4f05ae7ad1e910e84ebf8ba65e6afb3bd.zip |
Merge "Disable geometry button if tiny planet is here" into gb-ub-photos-carlsbad
Diffstat (limited to 'src')
-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); + } } |