Tobias Thierer 301bf35e2d resolve merge conflicts of 5c9e47d28b to oc-mr1-dev-plus-aosp ...

Test: This merge conflict was automatically resolved by meld.
      The automatic resolution of the same merge conflict by meld
      from cherrypicking this CL into internal-master has passed
      Treehugger (and was already submitted).
Exempt-From-Owner-Approval: Resolving merge conflicts with no deltas
Change-Id: I61f15aeb79c1ad26cc7c51be2af59ecb7b672a7b

2017-10-19 15:33:17 +00:00

..

drawable

Add systrace for VectorDrawable inflation and draw

2017-09-22 19:44:24 +00:00

fonts

Remove FontVariationAxis.InvalidFormatException.

2017-04-28 15:24:40 -07:00

pdf

Merge "Framework: Prefer android.system.Os over libcore.io.Libcore.os"

2017-10-19 14:25:12 +00:00

AvoidXfermode.java

…

BaseCanvas.java

…

Bitmap.aidl

…

Bitmap.java

Better preload drawable logging

2017-07-14 11:40:29 -07:00

BitmapFactory.java

Throw if BitmapFactory.Options.inBitmap is HARDWARE

2017-09-14 21:13:58 +00:00

BitmapRegionDecoder.java

…

BitmapShader.java

…

BlurMaskFilter.java

…

Camera.java

…

Canvas.java

Add an O-release targetAPI check for Canvas.setBitmap.

2017-05-11 09:28:02 -04:00

CanvasProperty.java

…

Color.java

More auto-doc work.

2017-04-21 16:35:08 -06:00

ColorFilter.java

Use NativeAllocationRegistry for ColorFilter

2017-06-26 21:33:47 +00:00

ColorMatrix.java

…

ColorMatrixColorFilter.java

…

ColorSpace.java

More auto-doc work.

2017-04-21 16:35:08 -06:00

ComposePathEffect.java

…

ComposeShader.java

Convert Shader to NativeAllocationRegistry

2017-05-22 13:30:00 -07:00

CornerPathEffect.java

…

DashPathEffect.java

…

DiscretePathEffect.java

…

DrawFilter.java

…

EmbossMaskFilter.java

…

FontFamily.java

…

FontListParser.java

Revert "Implement family fallback." DO NOT MERGE

2017-07-26 22:21:14 +00:00

GraphicBuffer.aidl

…

GraphicBuffer.java

…

ImageFormat.java

ImageFormat: Document units/coordinate system for DEPTH_POINT_CLOUD

2017-10-02 11:39:41 -07:00

Insets.java

…

Interpolator.java

…

LargeBitmap.java

…

LayerRasterizer.java

…

LeakyTypefaceStorage.java

Support font resource in TextAppearanceSpan

2017-07-20 23:40:44 +00:00

LightingColorFilter.java

…

LinearGradient.java

…

MaskFilter.java

…

Matrix.java

…

Movie.java

…

NinePatch.java

…

Outline.java

…

package.html

…

Paint.java

Make strike-through respect kerning at boundaries

2017-07-13 13:21:00 -07:00

PaintFlagsDrawFilter.java

…

Path.java

Add conic support for Path#approximate

2017-04-27 16:24:18 -07:00

PathDashPathEffect.java

…

PathEffect.java

…

PathMeasure.java

…

Picture.java

…

PixelFormat.java

…

PixelXorXfermode.java

…

Point.aidl

…

Point.java

…

PointF.aidl

…

PointF.java

…

PorterDuff.java

…

PorterDuffColorFilter.java

…

PorterDuffXfermode.java

…

RadialGradient.java

…

Rasterizer.java

…

Rect.aidl

…

Rect.java

…

RectF.aidl

…

RectF.java

…

Region.aidl

…

Region.java

…

RegionIterator.java

…

Shader.java

Add nullptr check

2017-09-27 09:30:30 -07:00

SumPathEffect.java

…

SurfaceTexture.java

Make SurfaceTexture#isReleased public API

2017-04-25 15:57:57 -07:00

SweepGradient.java

…

TableMaskFilter.java

…

TemporaryBuffer.java

…

Typeface.java

Revert "Implement family fallback." DO NOT MERGE

2017-07-26 22:21:14 +00:00

Xfermode.java

…

YuvImage.java

…