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

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

am 7835ea8c: Merge "Fix crash" into gb-ub-photos-carlsbad 

* commit '7835ea8c':
  Fix crash
parents e74c8a0e 7835ea8c

src/com/android/gallery3d/filtershow/editors/EditorColorBorder.java

+3 −2
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ public class EditorColorBorder extends ParametricEditor { 
    private static final String LOGTAG = "EditorColorBorder";

    public static final int ID = R.id.editorColorBorder;





    int[] mBasColors = {

            FilterColorBorderRepresentation.DEFAULT_MENU_COLOR1,

            FilterColorBorderRepresentation.DEFAULT_MENU_COLOR2,
@@ -169,7 +168,9 @@ public class EditorColorBorder extends ParametricEditor { 
            ColorChooser c = (ColorChooser) mControl;

            mBasColors = c.getColorSet();

        }

        if (mEditControl != null) {

            control(rep.getCurrentParam(), mEditControl);

        }

        if (mControl instanceof ColorChooser) {

            ColorChooser c = (ColorChooser) mControl;

            c.setColorSet(mBasColors);