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

Commit d0f379c1 authored by Mike Klein's avatar Mike Klein
Browse files

Preserve fill type in Path.reset().

Bug: 10838355
Change-Id: I7bdecb945fc35dfed02d37745678ae7bda906628
parent 00fb27dd
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -78,7 +78,11 @@ public class Path {
            mLastDirection = null;
            if (rects != null) rects.setEmpty();
        }
        // We promised not to change this, so preserve it around the native
        // call, which does now reset fill type.
        final FillType fillType = getFillType();
        native_reset(mNativePath);
        setFillType(fillType);
    }

    /**
+37 −0
Original line number Diff line number Diff line
/*
 * Copyright (C) 2013 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package android.graphics;

import android.test.suitebuilder.annotation.SmallTest;
import junit.framework.TestCase;


public class PathTest extends TestCase {

    @SmallTest
    public void testResetPreservesFillType() throws Exception {
        Path path = new Path();

        final Path.FillType defaultFillType = path.getFillType();
        final Path.FillType fillType = Path.FillType.INVERSE_EVEN_ODD;
        assertFalse(fillType.equals(defaultFillType));  // Sanity check for the test itself.

        path.setFillType(fillType);
        path.reset();
        assertEquals(path.getFillType(), fillType);
    }
}