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

Commit aff375e3 authored by nicolasroard's avatar nicolasroard Committed by Android (Google) Code Review
Browse files

Merge "Fix crash / jank / presets add" into gb-ub-photos-carlsbad

parents a552bfde 3bc6e6f3

src/com/android/gallery3d/filtershow/FilterShowActivity.java

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ import com.android.gallery3d.filtershow.filters.FilterDrawRepresentation; 
import com.android.gallery3d.filtershow.filters.FilterMirrorRepresentation;

import com.android.gallery3d.filtershow.filters.FilterRepresentation;

import com.android.gallery3d.filtershow.filters.FilterRotateRepresentation;

import com.android.gallery3d.filtershow.filters.FilterStraightenRepresentation;

import com.android.gallery3d.filtershow.filters.FilterUserPresetRepresentation;

import com.android.gallery3d.filtershow.filters.FiltersManager;

import com.android.gallery3d.filtershow.filters.ImageFilter;

src/com/android/gallery3d/filtershow/cache/BitmapCache.java

+4 −0
Original line number Diff line number Diff line
@@ -137,6 +137,10 @@ public class BitmapCache { 
        if (DEBUG) {

            untrack(bitmap);

        }

        if (!bitmap.isMutable()) {

            Log.e(LOGTAG, "Trying to cache a non mutable bitmap");

            return true;

        }

        Long key = calcKey(bitmap.getWidth(), bitmap.getHeight());

        ArrayList<WeakReference<Bitmap>> list = mBitmapCache.get(key);

        if (list == null) {

src/com/android/gallery3d/filtershow/filters/FilterCropRepresentation.java

+2 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ public class FilterCropRepresentation extends FilterRepresentation { 
    RectF mCrop = getNil();



    public FilterCropRepresentation(RectF crop) {

        super(FilterCropRepresentation.class.getSimpleName());

        super(SERIALIZATION_NAME);

        setSerializationName(SERIALIZATION_NAME);

        setShowParameterValue(true);

        setFilterClass(FilterCropRepresentation.class);
@@ -48,6 +48,7 @@ public class FilterCropRepresentation extends FilterRepresentation { 


    public FilterCropRepresentation(FilterCropRepresentation m) {

        this(m.mCrop);

        setName(m.getName());

    }



    public FilterCropRepresentation() {

src/com/android/gallery3d/filtershow/filters/FilterMirrorRepresentation.java

+2 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ public class FilterMirrorRepresentation extends FilterRepresentation { 
    }



    public FilterMirrorRepresentation(Mirror mirror) {

        super(FilterMirrorRepresentation.class.getSimpleName());

        super(SERIALIZATION_NAME);

        setSerializationName(SERIALIZATION_NAME);

        setShowParameterValue(false);

        setFilterClass(FilterMirrorRepresentation.class);
@@ -79,6 +79,7 @@ public class FilterMirrorRepresentation extends FilterRepresentation { 


    public FilterMirrorRepresentation(FilterMirrorRepresentation m) {

        this(m.getMirror());

        setName(m.getName());

    }



    public FilterMirrorRepresentation() {

src/com/android/gallery3d/filtershow/filters/FilterRotateRepresentation.java

+2 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ public class FilterRotateRepresentation extends FilterRepresentation { 
    }



    public FilterRotateRepresentation(Rotation rotation) {

        super(FilterRotateRepresentation.class.getSimpleName());

        super(SERIALIZATION_NAME);

        setSerializationName(SERIALIZATION_NAME);

        setShowParameterValue(false);

        setFilterClass(FilterRotateRepresentation.class);
@@ -75,6 +75,7 @@ public class FilterRotateRepresentation extends FilterRepresentation { 


    public FilterRotateRepresentation(FilterRotateRepresentation r) {

        this(r.getRotation());

        setName(r.getName());

    }



    public FilterRotateRepresentation() {