LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove deprecated android.graphics.Canvas APIs

Browse Source 
Bug: 73777445
Test: compile
Change-Id: I0f203dd55d15408b1ebbbbb33e0d0b53366cc241
This commit is contained in:
Derek Sollenberger
2018-02-23 16:32:59 -05:00
parent b9d4110d50
commit e99a121cac
5 changed files with 5 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
samples/ApiDemos/src/com/example/android/apis/graphics/Clipping.java
View File

@@ -81,28 +81,7 @@ public class Clipping extends GraphicsActivity {
mPath.reset();
canvas.clipPath(mPath); // makes the clip empty
mPath.addCircle(50, 50, 50, Path.Direction.CCW);
canvas.clipPath(mPath, Region.Op.REPLACE);
drawScene(canvas);
canvas.restore();
canvas.save();
canvas.translate(160, 160);
canvas.clipRect(0, 0, 60, 60);
canvas.clipRect(40, 40, 100, 100, Region.Op.UNION);
drawScene(canvas);
canvas.restore();
canvas.save();
canvas.translate(10, 310);
canvas.clipRect(0, 0, 60, 60);
canvas.clipRect(40, 40, 100, 100, Region.Op.XOR);
drawScene(canvas);
canvas.restore();
canvas.save();
canvas.translate(160, 310);
canvas.clipRect(0, 0, 60, 60);
canvas.clipRect(40, 40, 100, 100, Region.Op.REVERSE_DIFFERENCE);
canvas.clipPath(mPath);
drawScene(canvas);
canvas.restore();
}

8
samples/ApiDemos/src/com/example/android/apis/graphics/Layers.java
View File

@@ -30,12 +30,6 @@ public class Layers extends GraphicsActivity {
}
private static class SampleView extends View {
private static final int LAYER_FLAGS = Canvas.MATRIX_SAVE_FLAG |
Canvas.CLIP_SAVE_FLAG |
Canvas.HAS_ALPHA_LAYER_SAVE_FLAG |
Canvas.FULL_COLOR_LAYER_SAVE_FLAG |
Canvas.CLIP_TO_LAYER_SAVE_FLAG;
private Paint mPaint;
public SampleView(Context context) {
@@ -51,7 +45,7 @@ public class Layers extends GraphicsActivity {
canvas.translate(10, 10);
canvas.saveLayerAlpha(0, 0, 200, 200, 0x88, LAYER_FLAGS);
canvas.saveLayerAlpha(0, 0, 200, 200, 0x88);
mPaint.setColor(Color.RED);
canvas.drawCircle(75, 75, 75, mPaint);

2
samples/ApiDemos/src/com/example/android/apis/graphics/TouchPaint.java
View File

@@ -490,7 +490,7 @@ public class TouchPaint extends GraphicsActivity {
private final RectF mReusableOvalRect = new RectF();
private void drawOval(Canvas canvas, float x, float y, float major, float minor,
float orientation, Paint paint) {
canvas.save(Canvas.MATRIX_SAVE_FLAG);
canvas.save();
canvas.rotate((float) (orientation * 180 / Math.PI), x, y);
mReusableOvalRect.left = x - minor / 2;
mReusableOvalRect.right = x + minor / 2;

7
samples/ApiDemos/src/com/example/android/apis/graphics/Xfermodes.java
View File

@@ -140,12 +140,7 @@ public class Xfermodes extends GraphicsActivity {
canvas.drawRect(x, y, x + W, y + H, paint);
// draw the src/dst example into our offscreen bitmap
int sc = canvas.saveLayer(x, y, x + W, y + H, null,
Canvas.MATRIX_SAVE_FLAG |
Canvas.CLIP_SAVE_FLAG |
Canvas.HAS_ALPHA_LAYER_SAVE_FLAG |
Canvas.FULL_COLOR_LAYER_SAVE_FLAG |
Canvas.CLIP_TO_LAYER_SAVE_FLAG);
int sc = canvas.saveLayer(x, y, x + W, y + H, null);
canvas.translate(x, y);
canvas.drawBitmap(mDstB, 0, 0, paint);
paint.setXfermode(sModes[i]);

2
samples/ApiDemos/src/com/example/android/apis/view/GameView.java
View File

@@ -690,7 +690,7 @@ public class GameView extends View {
255, 63, 255, 63,
0, 255, 0, 0);
canvas.save(Canvas.MATRIX_SAVE_FLAG);
canvas.save();
canvas.translate(mPositionX, mPositionY);
canvas.rotate(mHeadingAngle * TO_DEGREES);
canvas.drawPath(mPath, mPaint);