Merge "Allow non-convex paths in Outline#setConvexPath" into qt-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
9be1d08acb
@@ -273,8 +273,12 @@ public final class Outline {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets the Constructs an Outline from a
|
* Sets the Outline to a
|
||||||
* {@link android.graphics.Path#isConvex() convex path}.
|
* {@link android.graphics.Path#isConvex() convex path}.
|
||||||
|
*
|
||||||
|
* @param convexPath used to construct the Outline. As of
|
||||||
|
* {@link android.os.Build.VERSION_CODES#Q}, it is no longer required to be
|
||||||
|
* convex.
|
||||||
*/
|
*/
|
||||||
public void setConvexPath(@NonNull Path convexPath) {
|
public void setConvexPath(@NonNull Path convexPath) {
|
||||||
if (convexPath.isEmpty()) {
|
if (convexPath.isEmpty()) {
|
||||||
@@ -282,10 +286,6 @@ public final class Outline {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!convexPath.isConvex()) {
|
|
||||||
throw new IllegalArgumentException("path must be convex");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (mPath == null) {
|
if (mPath == null) {
|
||||||
mPath = new Path();
|
mPath = new Path();
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user