Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07986225 authored by nicolasroard's avatar nicolasroard Committed by Android Git Automerger
Browse files

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

* commit 'c82e65b4':
  Disable geometry button if tiny planet is here
parents d6644d60 c82e65b4

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

+4 −0
Original line number Diff line number Diff line
@@ -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();

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

+4 −0
Original line number Diff line number Diff line
@@ -829,4 +829,8 @@ public class MasterImage implements RenderingRequestCaller { 
    public BitmapCache getBitmapCache() {

        return mBitmapCache;

    }



    public boolean hasTinyPlanet() {

        return mPreset.contains(FilterRepresentation.TYPE_TINYPLANET);

    }

}