frameworks_base

pdf

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

2014-11-21 10:36:14 -08:00

AutoDecodeCancel.cpp

…

AutoDecodeCancel.h

Frameworks/base: Consistency in core/jni

2014-11-21 10:15:08 -08:00

Bitmap.cpp

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

2014-11-21 10:36:14 -08:00

BitmapFactory.cpp

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

2014-11-21 10:36:14 -08:00

BitmapFactory.h

Frameworks/base: Consistency in core/jni

2014-11-21 10:15:08 -08:00

BitmapRegionDecoder.cpp

Frameworks/base: Consistency in core/jni

2014-11-21 10:15:08 -08:00

Camera.cpp

Frameworks/base: Consistency in core/jni

2014-11-21 10:15:08 -08:00

Canvas.h

Move Canvas.h to a new location so that it can be shared with HWUI.

2014-07-25 11:39:37 -04:00

CanvasProperty.cpp

Frameworks/base: Consistency in core/jni

2014-11-21 10:15:08 -08:00

ColorFilter.cpp

Frameworks/base: Consistency in core/jni

2014-11-21 10:15:08 -08:00

CreateJavaOutputStreamAdaptor.cpp

am 0626ec58: Merge "Frameworks/base: Wall Werror in core/jni"

2014-11-13 23:35:22 +00:00

CreateJavaOutputStreamAdaptor.h

Frameworks/base: Consistency in core/jni

2014-11-21 10:15:08 -08:00

DrawFilter.cpp

Frameworks/base: Consistency in core/jni

2014-11-21 10:15:08 -08:00

FontFamily.cpp

Frameworks/base: Consistency in core/jni

2014-11-21 10:15:08 -08:00

Graphics.cpp

resolved conflicts for merge of 203c8171 to master

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

GraphicsJNI.h

resolved conflicts for merge of 203c8171 to master

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

HarfBuzzNGFaceSkia.cpp

Frameworks/base: Consistency in core/jni

2014-11-21 10:15:08 -08:00

HarfBuzzNGFaceSkia.h

Frameworks/base: Consistency in core/jni

2014-11-21 10:15:08 -08:00

Interpolator.cpp

Frameworks/base: Consistency in core/jni

2014-11-21 10:15:08 -08:00

MaskFilter.cpp

Frameworks/base: Consistency in core/jni

2014-11-21 10:15:08 -08:00

Matrix.cpp

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

2014-11-21 10:36:14 -08:00

Matrix.h

Frameworks/base: Consistency in core/jni

2014-11-21 10:15:08 -08:00

MinikinSkia.cpp

Fix incorrect return value on missing glyph

2014-08-26 22:19:29 -07:00

MinikinSkia.h

Frameworks/base: Consistency in core/jni

2014-11-21 10:15:08 -08:00

MinikinUtils.cpp

Frameworks/base: Wall Werror in core/jni

2014-11-13 15:20:37 -08:00

MinikinUtils.h

Frameworks/base: Consistency in core/jni

2014-11-21 10:15:08 -08:00

Movie.cpp

resolve merge conflicts of 7d13d9d to master.

2014-11-21 14:05:11 -08:00

NinePatch.cpp

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

2014-11-21 10:36:14 -08:00

NinePatchImpl.cpp

Frameworks/base: Consistency in core/jni

2014-11-21 10:15:08 -08:00

NinePatchPeeker.cpp

SkBitmap::Config is deprecated

2014-08-14 09:57:06 -04:00

NinePatchPeeker.h

Frameworks/base: Consistency in core/jni

2014-11-21 10:15:08 -08:00

Paint.cpp

resolve merge conflicts of 7d13d9d to master.

2014-11-21 14:05:11 -08:00

Paint.h

Frameworks/base: Consistency in core/jni

2014-11-21 10:15:08 -08:00

PaintImpl.cpp

Preserve paint parameters in Paint copy constructor

2014-08-25 09:36:29 -07:00

Path.cpp

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

2014-11-21 10:36:14 -08:00

PathEffect.cpp

Frameworks/base: Consistency in core/jni

2014-11-21 10:15:08 -08:00

PathMeasure.cpp

Frameworks/base: Consistency in core/jni

2014-11-21 10:15:08 -08:00

Picture.cpp

Merge "Remove use of default SkPicture ctor"

2014-09-02 19:36:39 +00:00

Picture.h

Frameworks/base: Consistency in core/jni

2014-11-21 10:15:08 -08:00

PorterDuff.cpp

Frameworks/base: Consistency in core/jni

2014-11-21 10:15:08 -08:00

Rasterizer.cpp

Frameworks/base: Consistency in core/jni

2014-11-21 10:15:08 -08:00

Region.cpp

Frameworks/base: Consistency in core/jni

2014-11-21 10:15:08 -08:00

Region.h

Frameworks/base: Consistency in core/jni

2014-11-21 10:15:08 -08:00

RtlProperties.h

Frameworks/base: Consistency in core/jni

2014-11-21 10:15:08 -08:00

Shader.cpp

resolve merge conflicts of 7d13d9d to master.

2014-11-21 14:05:11 -08:00

SkiaCanvas.cpp

drawBitmapMatrix is deprecated, code work-around

2014-12-08 17:03:30 -05:00

SurfaceTexture.cpp

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

2014-11-21 10:36:14 -08:00

Typeface.cpp

Frameworks/base: Consistency in core/jni

2014-11-21 10:15:08 -08:00

TypefaceImpl.cpp

New weight-aware font config

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

TypefaceImpl.h

Frameworks/base: Consistency in core/jni

2014-11-21 10:15:08 -08:00

Utils.cpp

…

Utils.h

Frameworks/base: Consistency in core/jni

2014-11-21 10:15:08 -08:00

Xfermode.cpp

Frameworks/base: Consistency in core/jni

2014-11-21 10:15:08 -08:00

YuvToJpegEncoder.cpp

Frameworks/base: Consistency in core/jni

2014-11-21 10:15:08 -08:00

YuvToJpegEncoder.h

Frameworks/base: Consistency in core/jni

2014-11-21 10:15:08 -08:00