| Chunk |
|---|
| Conflicting content |
|---|
// because x/y is the center of the circle, need to offset this by the radius
pathDelegate.mPath.append(new Arc2D.Float(
oval.left, oval.top, oval.width(), oval.height(),
<<<<<<< HEAD
-startAngle, -sweepAngle, Arc2D.OPEN), false);
=======
startAngle, sweepAngle, Arc2D.OPEN), false);
>>>>>>> 405cb57019e0b0b9c2049c2b06537c0f4981fc37
}
@LayoutlibDelegate |
| Solution content |
|---|
// because x/y is the center of the circle, need to offset this by the radius
pathDelegate.mPath.append(new Arc2D.Float(
oval.left, oval.top, oval.width(), oval.height(),
-startAngle, -sweepAngle, Arc2D.OPEN), false);
}
@LayoutlibDelegate |
| File |
|---|
| Path_Delegate.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
=======
for (int i = 0 ; i < 3 ; i++) {
if (radii[i * 2] != radii[(i + 1) * 2] || radii[i * 2 + 1] != radii[(i + 1) * 2 + 1]) {
Bridge.getLog().fidelityWarning(LayoutLog.TAG_UNSUPPORTED,
<<<<<<< HEAD
"Different corner sizes are not supported in Path.addRoundRect.",
"Different corner size is not support in Path.addRoundRect.",
>>>>>>> 405cb57019e0b0b9c2049c2b06537c0f4981fc37
null, null /*data*/);
break;
} |
| Solution content |
|---|
for (int i = 0 ; i < 3 ; i++) {
if (radii[i * 2] != radii[(i + 1) * 2] || radii[i * 2 + 1] != radii[(i + 1) * 2 + 1]) {
Bridge.getLog().fidelityWarning(LayoutLog.TAG_UNSUPPORTED,
"Different corner sizes are not supported in Path.addRoundRect.",
null, null /*data*/);
break;
} |
| File |
|---|
| Path_Delegate.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Other |