Nick Kralevich 7668e78601 resolved conflicts for merge of 3bae94d7 to master ...

Change-Id: I381539b1494447d62290c492f2550840fe0b559c

2014-12-10 11:03:40 -08:00

..

drawable

resolved conflicts for merge of fe11126d to lmp-mr1-dev-plus-aosp

2014-12-09 15:38:38 -08:00

pdf

Crash apps that print malformed or password protected PDFs.

2014-11-01 00:06:08 +00:00

Atlas.java

…

AvoidXfermode.java

…

Bitmap.aidl

…

Bitmap.java

resolved conflicts for merge of 203c8171 to master

2014-12-04 16:06:34 -08:00

BitmapFactory.java

Put in real "code" (aka marketing) name.

2014-10-07 20:17:19 -07:00

BitmapRegionDecoder.java

…

BitmapShader.java

Make updateLocalMatrix replace the current Matrix.

2014-07-24 09:30:23 -04:00

BlurMaskFilter.java

Document BlurMaskFilter.Blur.

2014-07-24 10:41:27 -04:00

Camera.java

Add a native Canvas wrapper.

2014-05-30 16:11:04 -04:00

Canvas.java

Merge "Revert "Add a way to override Xfermode""

2014-11-21 22:11:14 +00:00

CanvasProperty.java

Mutable Java Shaders with Immutable Native Shaders

2014-10-06 13:04:45 -04:00

Color.java

…

ColorFilter.java

…

ColorMatrix.java

am 93ef9639: Merge "Improve ColorMatrix docs" into lmp-mr1-dev

2014-11-21 02:48:35 +00:00

ColorMatrixColorFilter.java

Hide other color filter mutability

2014-09-19 08:54:09 -07:00

ComposePathEffect.java

…

ComposeShader.java

Make updateLocalMatrix replace the current Matrix.

2014-07-24 09:30:23 -04:00

CornerPathEffect.java

…

DashPathEffect.java

…

DiscretePathEffect.java

…

DrawFilter.java

Refactor HWUI to better handle Canvas DrawFilters.

2014-10-17 10:44:29 -04:00

EmbossMaskFilter.java

…

FontFamily.java

New weight-aware font config

2014-08-26 19:37:45 -07:00

FontListParser.java

New weight-aware font config

2014-08-26 19:37:45 -07:00

ImageFormat.java

ImageFormat: update raw10 spec to allow row padding

2014-07-28 18:42:10 +00:00

Insets.java

…

Interpolator.java

…

LargeBitmap.java

…

LayerRasterizer.java

Mutable Java Shaders with Immutable Native Shaders

2014-10-06 13:04:45 -04:00

LightingColorFilter.java

Hide other color filter mutability

2014-09-19 08:54:09 -07:00

LinearGradient.java

Make updateLocalMatrix replace the current Matrix.

2014-07-24 09:30:23 -04:00

MaskFilter.java

…

Matrix.java

Adding APIs to render PDF documents.

2014-05-13 18:32:42 -07:00

Movie.java

Mutable Java Shaders with Immutable Native Shaders

2014-10-06 13:04:45 -04:00

NinePatch.java

Mutable Java Shaders with Immutable Native Shaders

2014-10-06 13:04:45 -04:00

Outline.java

Add offset method to Outline

2014-11-12 16:17:33 -08:00

package.html

…

Paint.java

Ensure that all requests for the Paint's nativePtr use p.getNativeInstance()

2014-10-17 08:22:46 -04:00

PaintFlagsDrawFilter.java

Refactor HWUI to better handle Canvas DrawFilters.

2014-10-17 10:44:29 -04:00

Path.java

Add offset method to Outline

2014-11-12 16:17:33 -08:00

PathDashPathEffect.java

…

PathEffect.java

…

PathMeasure.java

am 7ea31c67: am c43f3eb6: am 8b333467: Merge "fix trivial typo: s/meansure/measure"

2014-07-05 17:11:55 +00:00

Picture.java

Put in real "code" (aka marketing) name.

2014-10-07 20:17:19 -07:00

PixelFormat.java

camera2: Add camera-specific data types used for metadata key/value

2014-05-02 15:55:30 -07:00

PixelXorXfermode.java

…

Point.aidl

…

Point.java

…

PointF.aidl

…

PointF.java

Switch from FloatMath -> Math and Math.hypot where possible

2014-10-01 14:04:15 +01:00

PorterDuff.java

…

PorterDuffColorFilter.java

Hide other color filter mutability

2014-09-19 08:54:09 -07:00

PorterDuffXfermode.java

…

RadialGradient.java

Update radial gradient doc

2014-08-06 23:25:09 +00:00

Rasterizer.java

document and deprecated Rasterizer

2014-05-09 16:35:57 -04:00

Rect.aidl

…

Rect.java

Implement outline support for nine patches

2014-07-14 15:01:27 -07:00

RectF.aidl

…

RectF.java

Switch from FloatMath -> Math and Math.hypot where possible

2014-10-01 14:04:15 +01:00

Region.aidl

…

Region.java

…

RegionIterator.java

…

Shader.java

Mutable Java Shaders with Immutable Native Shaders

2014-10-06 13:04:45 -04:00

SumPathEffect.java

…

SurfaceTexture.java

Deprecate android.hardware.Camera

2014-07-13 21:45:57 -07:00

SweepGradient.java

Make updateLocalMatrix replace the current Matrix.

2014-07-24 09:30:23 -04:00

TableMaskFilter.java

…

TemporaryBuffer.java

Uses VMRuntime.newUnpaddedArray for ideal array sizes

2014-03-27 11:42:10 -07:00

Typeface.java

New weight-aware font config

2014-08-26 19:37:45 -07:00

Xfermode.java

…

YuvImage.java

…