diff options
author | Derek Sollenberger <djsollen@google.com> | 2018-02-28 12:56:41 -0500 |
---|---|---|
committer | Derek Sollenberger <djsollen@google.com> | 2018-03-07 18:22:48 +0000 |
commit | 6dae3a5d91b73210f4f81216d8b279ce60e39a46 (patch) | |
tree | 026191561bbea60d03fbb06e1fe92b8c0c8a4245 | |
parent | c66727ebf001607cee14521c35bc852b55fd9845 (diff) | |
download | androidplot-pie-b4s4-dev.tar.gz |
Stop using deprecated Canvas APIs.android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-dev
Bug: 73777445
Test: compile
Change-Id: Id7f8d34f69c88f1706a4f218d9680426e1808408
5 files changed, 9 insertions, 9 deletions
diff --git a/AndroidPlot-Core/src/main/java/com/androidplot/ui/LayoutManager.java b/AndroidPlot-Core/src/main/java/com/androidplot/ui/LayoutManager.java index 1983ca7..dde214a 100644 --- a/AndroidPlot-Core/src/main/java/com/androidplot/ui/LayoutManager.java +++ b/AndroidPlot-Core/src/main/java/com/androidplot/ui/LayoutManager.java @@ -89,7 +89,7 @@ public class LayoutManager extends ZLinkedList<Widget> for (Widget widget : elements()) {
//int canvasState = canvas.save(Canvas.ALL_SAVE_FLAG); // preserve clipping etc
try {
- canvas.save(Canvas.ALL_SAVE_FLAG);
+ canvas.save();
PositionMetrics metrics = widget.getPositionMetrics();
float elementWidth = widget.getWidthPix(displayDims.paddedRect.width());
float elementHeight = widget.getHeightPix(displayDims.paddedRect.height());
@@ -148,8 +148,8 @@ public class LayoutManager extends ZLinkedList<Widget> private void drawSpacing(Canvas canvas, RectF outer, RectF inner, Paint paint) {
//int saved = canvas.save(Canvas.ALL_SAVE_FLAG);
try {
- canvas.save(Canvas.ALL_SAVE_FLAG);
- canvas.clipRect(inner, Region.Op.DIFFERENCE);
+ canvas.save();
+ canvas.clipOutRect(inner);
canvas.drawRect(outer, paint);
//canvas.restoreToCount(saved);
} finally {
diff --git a/AndroidPlot-Core/src/main/java/com/androidplot/ui/SeriesRenderer.java b/AndroidPlot-Core/src/main/java/com/androidplot/ui/SeriesRenderer.java index b32f12d..fb864c7 100644 --- a/AndroidPlot-Core/src/main/java/com/androidplot/ui/SeriesRenderer.java +++ b/AndroidPlot-Core/src/main/java/com/androidplot/ui/SeriesRenderer.java @@ -62,8 +62,8 @@ public abstract class SeriesRenderer public void drawSeriesLegendIcon(Canvas canvas, RectF rect, SeriesFormatterType formatter) { //int state = canvas.save(Canvas.CLIP_SAVE_FLAG); try { - canvas.save(Canvas.ALL_SAVE_FLAG); - canvas.clipRect(rect, Region.Op.INTERSECT); + canvas.save(); + canvas.clipRect(rect); doDrawLegendIcon(canvas, rect, formatter); //canvas.restoreToCount(state); } finally { diff --git a/AndroidPlot-Core/src/main/java/com/androidplot/ui/widget/TextLabelWidget.java b/AndroidPlot-Core/src/main/java/com/androidplot/ui/widget/TextLabelWidget.java index 96615b8..93004d1 100644 --- a/AndroidPlot-Core/src/main/java/com/androidplot/ui/widget/TextLabelWidget.java +++ b/AndroidPlot-Core/src/main/java/com/androidplot/ui/widget/TextLabelWidget.java @@ -115,7 +115,7 @@ public class TextLabelWidget extends Widget { //int canvasState = canvas.save(Canvas.ALL_SAVE_FLAG);
try {
- canvas.save(Canvas.ALL_SAVE_FLAG);
+ canvas.save();
canvas.translate(start.x, start.y);
switch (orientation) {
case HORIZONTAL:
diff --git a/AndroidPlot-Core/src/main/java/com/androidplot/xy/LineAndPointRenderer.java b/AndroidPlot-Core/src/main/java/com/androidplot/xy/LineAndPointRenderer.java index 14595c4..12f96f0 100644 --- a/AndroidPlot-Core/src/main/java/com/androidplot/xy/LineAndPointRenderer.java +++ b/AndroidPlot-Core/src/main/java/com/androidplot/xy/LineAndPointRenderer.java @@ -205,7 +205,7 @@ public class LineAndPointRenderer<FormatterType extends LineAndPointFormatter> e RectF regionRect = r.getRectF(plotArea, minX, maxX, minY, maxY);
if (regionRect != null) {
try {
- canvas.save(Canvas.ALL_SAVE_FLAG);
+ canvas.save();
canvas.clipPath(path);
canvas.drawRect(regionRect, f.getPaint());
} finally {
diff --git a/AndroidPlot-Core/src/main/java/com/androidplot/xy/XYGraphWidget.java b/AndroidPlot-Core/src/main/java/com/androidplot/xy/XYGraphWidget.java index c6ce620..e46a676 100644 --- a/AndroidPlot-Core/src/main/java/com/androidplot/xy/XYGraphWidget.java +++ b/AndroidPlot-Core/src/main/java/com/androidplot/xy/XYGraphWidget.java @@ -824,8 +824,8 @@ public class XYGraphWidget extends Widget { // int canvasState = canvas.save();
try {
- canvas.save(Canvas.ALL_SAVE_FLAG);
- canvas.clipRect(gridRect, android.graphics.Region.Op.INTERSECT);
+ canvas.save();
+ canvas.clipRect(gridRect);
for (XYSeriesRenderer renderer : plot.getRendererList()) {
renderer.render(canvas, paddedGridRect);
}
|