1391 Commits

Author SHA1 Message Date
Chris Craik
ed2515e853 am 908d9bfa: am dc70afae: Merge "Add inPremutiplied option to BitmapFactory.Options, functionality in Bitmap" into klp-dev
* commit '908d9bfafd576755d06f0566fc4cac3831476f63':
  Add inPremutiplied option to BitmapFactory.Options, functionality in Bitmap
2013-08-21 10:26:23 -07:00
Chris Craik
1abf5d6242 Add inPremutiplied option to BitmapFactory.Options, functionality in Bitmap
bug:2248948

Change-Id: I8fdd649332667598504a1076d5a447572bd53086
2013-08-20 18:29:33 -07:00
Eino-Ville Talvala
4e802a78e6 am 948e200e: am 9fac8a6a: Merge "Renderscript: Allow YUV_420_888 as a YUV type." into klp-dev
* commit '948e200e2d281c4547faac2f2a429c4aa73a010b':
  Renderscript: Allow YUV_420_888 as a YUV type.
2013-08-20 17:40:07 -07:00
Eino-Ville Talvala
9fac8a6a4a Merge "Renderscript: Allow YUV_420_888 as a YUV type." into klp-dev 2013-08-21 00:36:45 +00:00
Romain Guy
13656743cc Make color filters mutable
Change-Id: I3d035d24a75e09db13d136a22bd7dbd326d0ce36
2013-08-19 18:18:00 -07:00
Mike Klein
e78044a9e3 am bc37c299: am be925721: Remove comment that\'s only relevant for the underlying SkMatrix. Matrix has constructors.
* commit 'bc37c2991779b7c9372e5cbc3bd177273aae5644':
  Remove comment that's only relevant for the underlying SkMatrix.  Matrix has constructors.
2013-08-14 10:42:58 -07:00
Eino-Ville Talvala
ccadaf1eb4 Renderscript: Allow YUV_420_888 as a YUV type.
Change-Id: I1ed731103a49a814f9a049ecd01be98261b6d06b
2013-08-14 10:40:30 -07:00
Mike Klein
be925721a5 Remove comment that's only relevant for the underlying SkMatrix. Matrix has constructors.
bug: 8470620

Change-Id: I00063dc03f752955c27c73e9c59b0496a1795924
2013-08-14 13:13:51 -04:00
Romain Guy
e74d0d0bf2 am 820726d7: am 9955699d: Merge "Camera.applyToCanvas() now works with hardware canvases" into klp-dev
* commit '820726d7c6fa46203585025ac7fddff8f19ed0f3':
  Camera.applyToCanvas() now works with hardware canvases
2013-08-13 10:53:01 -07:00
Romain Guy
7fbbc3c9c3 Camera.applyToCanvas() now works with hardware canvases
Change-Id: I7f06b2a74ccc1941d51e12a0417028e094c1b669
2013-08-13 10:37:25 -07:00
Romain Guy
e95e421cbe am 98e50c50: am 964f2b30: Merge "Update Bitmap.createBitmap() documentation" into klp-dev
* commit '98e50c50f52b045d944df2eee0987d06eb1af07d':
  Update Bitmap.createBitmap() documentation
2013-08-12 11:20:12 -07:00
Romain Guy
790552b240 Update Bitmap.createBitmap() documentation
Change-Id: Ic2efed6cc03c8b2c2d9810b7ab645b0b98b91e1f
2013-08-12 11:10:27 -07:00
Fabrice Di Meglio
4362383027 am b945d80c: am 5af4edef: Merge "Fix bug #10205316 CTS (KLP): android.graphics tests are failing" into klp-dev
* commit 'b945d80c9bb91b90e48add2a4f665de02c63e28c':
  Fix bug #10205316 CTS (KLP): android.graphics tests are failing
2013-08-09 15:53:33 -07:00
Fabrice Di Meglio
5af4edef08 Merge "Fix bug #10205316 CTS (KLP): android.graphics tests are failing" into klp-dev 2013-08-09 18:11:33 +00:00
Romain Guy
40bac4107d am ac322988: am 00312300: Remove an unnecessary allocation
* commit 'ac322988339d98665eff9f5937caff9a4eadd9d2':
  Remove an unnecessary allocation
2013-08-09 06:07:18 -07:00
Jonathan Dixon
5abec6ec5f am de3ff4b4: am 42773328: Merge "Refactor Canvas.drawPicture() to delegate to Picture" into klp-dev
* commit 'de3ff4b4859a92a19d84b33f5a93a0b3454698e6':
  Refactor Canvas.drawPicture() to delegate to Picture
2013-08-09 06:06:55 -07:00
Romain Guy
003123004f Remove an unnecessary allocation
Also remove dead code from OpenGLRenderer.cpp

Change-Id: I7eb54ca19e77ee3c32f1fe9513a031e6b2e115cf
(cherry picked from commit 5c7d5ab878b26f855175a3305a14ac12fcacf25e)
2013-08-09 03:52:29 +00:00
Fabrice Di Meglio
41207bce2a Fix bug #10205316 CTS (KLP): android.graphics tests are failing
- fix null Shader case during copy

Related to https://googleplex-android-review.googlesource.com/#/c/336815/7

Change-Id: I920d6bb181ddb92d6f771e5060fd1858430e71ad
2013-08-08 19:11:34 -07:00
Jonathan Dixon
667fe1039f Refactor Canvas.drawPicture() to delegate to Picture
Bug: 9814370

To allow WebView.capturePicture() to return a subclass, we need to
ensure the subclass is always consulted when being drawn into a canvas.

Change-Id: Ia0357f95b6fafb3ac81e6bcfaef05739e619897a
2013-08-08 17:22:48 -07:00
Chris Craik
be6f592ce2 Merge "Better explain outWidth/Height use with inJustDecodeBounds" 2013-08-08 20:44:35 +00:00
Mathias Agopian
52a9a10b6b Clearly separate consumer and producer interfaces
Bug: 9265647
Change-Id: Ic68e91788d0a05251e1d2fb9f9d4de403c7099bf
2013-08-06 13:07:42 -07:00
Chris Craik
544333b39e Better explain outWidth/Height use with inJustDecodeBounds
Change-Id: I81d2d63a1dd0792ca11a157b30152496b16e4c8d
2013-08-05 14:58:36 -07:00
Elliott Hughes
f2ce9f994a am eab8e18d: am 8a736129: Merge "If graphics wants ASCII lowercasing, it needs to ask for it."
* commit 'eab8e18d8f6f34a9d35fbb120148956789ad48a2':
  If graphics wants ASCII lowercasing, it needs to ask for it.
2013-08-05 11:10:06 -07:00
Elliott Hughes
eab8e18d8f am 8a736129: Merge "If graphics wants ASCII lowercasing, it needs to ask for it."
* commit '8a736129faa9e41b5f33c42bbeae1f68cb42d38f':
  If graphics wants ASCII lowercasing, it needs to ask for it.
2013-08-05 11:07:13 -07:00
Igor Murashkin
b7645acfd9 Merge "graphics: Update ImageFormat#YUV_420_888 javadoc" 2013-08-02 23:43:54 +00:00
Igor Murashkin
7a600ff65f graphics: Update ImageFormat#YUV_420_888 javadoc
* Make it clear that the Y-plane is not interleaved for YUV_420_888
* Make it clear that the U/V plane have the same stride
* Make it clear what the order of Y/U/V planes is

Change-Id: Id85d7c68e84382149dbf0e8b4e965ba2988326fe
2013-08-02 16:39:03 -07:00
Derek Sollenberger
e242e2f236 Merge "Changes needed to support Skia at r10377." 2013-08-02 17:03:37 +00:00
Elliott Hughes
aeb60fb86f If graphics wants ASCII lowercasing, it needs to ask for it.
http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html

Bug: https://code.google.com/p/android/issues/detail?id=58359
Change-Id: I13c106985302335dbb15bb9176d35ec6b4546d4e
2013-08-02 09:31:11 -07:00
Fabrice Di Meglio
3f5a90b2fb Add automatic Drawable mirroring capability when in RTL layout direction
- default value is "no mirroring"
- introduce android:autoMirrored as a new attribute for Drawable,
BitmapDrawable, LayerDrawable, StateListDrawable and NinePatchDrawable
- setting android:autoMirrored="true" means that the drawable will
be mirrored when the layout direction is RTL (right-to-left)
- also fix an issue with ImageView drawable layout direction not
updated correctly when RTL properties were changed

See bug #7034321 Need Drawable RTL support

Change-Id: If595ee5106c786f38e786d3a032e182f784a9d97
2013-08-01 15:15:10 -07:00
Fabrice Di Meglio
851761574a Merge "Fix Paint Shader copy" 2013-08-01 21:50:14 +00:00
Fabrice Di Meglio
e3c526f4f6 Fix Paint Shader copy
- Paint.setClassVariablesFrom(Paint paint) was using the same Shader
for the copy as the initial Paint. Make sure that we are using a copy.
- implement a copy() API for shaders

See bug #7034321 Need Drawable RTL support

Change-Id: I4b9cee386edc72ad670723266333b85f4d2b0ab8
2013-08-01 14:33:22 -07:00
Derek Sollenberger
5827cb5059 Changes needed to support Skia at r10377.
Change-Id: Id1e1c8c5938ee1a33c6fa3caabd2c28e89243eb4
2013-08-01 12:52:21 -04:00
Romain Guy
5d3dff1d66 Merge "Add missing alpha channel to built-in colors" 2013-08-01 16:46:04 +00:00
Romain Guy
86d3e03d38 Add missing alpha channel to built-in colors
Change-Id: I911c17b623513b2715668d0f91604b28c32a969a
2013-08-01 09:43:26 -07:00
Victoria Lease
1e546815bb Support RGBA fonts and bitmap fonts (and RGBA bitmap fonts)
Quite a few things going on in this commit:

- Enable bitmap strikes by default in Paint objects.

The SkPaint parameter that enables bitmap strikes was not previously
included in DEFAULT_PAINT_FLAGS. This effectively disabled bitmap
fonts. Oops! It's for the best, though, as additional work was needed
in Skia to make bitmap fonts work anyway.

- Complain if TEXTURE_BORDER_SIZE is not 1.

Our glyph cache code does not currently handle any value other than 1
here, including zero. I've added a little C preprocessor check to
prevent future engineers (including especially future-me) from
thinking that they can change this value without updating the related
code.

- Add GL_RGBA support to hwui's FontRenderer and friends

This also happened to involve some refactoring for convenience and
cleanliness.

Bug: 9577689
Change-Id: I0abd1e5a0d6623106247fb6421787e2c2f2ea19c
2013-07-31 15:50:47 -07:00
Romain Guy
6d64d5ab84 Merge "Add missing InsetDrawable.getDrawable() method" 2013-07-31 00:54:25 +00:00
Romain Guy
84956d53f1 Add missing InsetDrawable.getDrawable() method
Change-Id: I216b0e8a327f495fd83ebac79013418dbae007b9
2013-07-30 13:01:40 -07:00
Eino-Ville Talvala
2f1a2e423e Camera2 API: Rename package to android.hardware.camera2
Change-Id: I77b7939e199f9fe8e12a59393c24cff08097448c
2013-07-30 11:37:31 -07:00
Romain Guy
56fbb6362b Merge "Add path ops API" 2013-07-30 17:53:05 +00:00
Romain Guy
8018c8db82 Add path ops API
Path ops can be used to combine two paths instances in a single path
object. The following operations can be used:

- Difference
- Reverse difference
- Union
- XOR
- Intersection

To use the API:

Path p1 = createCircle();
Path p2 = createRect();

Path result = new Path();
result.op(p1, p2, Path.Op.DIFFERENCE);

This code will subtract the rectangle from the circle and generate
the resulting path in "result."

Change-Id: Ic25244665b6691a7df0b0002a09da73d937b553b
2013-07-30 10:51:24 -07:00
Jason Sams
d979208974 Relax restriction on Colormatrix and add Add step.
Change-Id: Iccb519bb40f58f02346b5c0a10c1378cb853e3f8
2013-07-29 22:09:08 +00:00
Mathias Agopian
cb92a8d942 fix SDK build
Change-Id: I41c19740b8f0532dbd6184e13bae43a13aaa46e2
2013-07-27 17:16:53 -07:00
Mathias Agopian
e591b49de0 single buffer mode for SurfaceTexture
Bug: 9891035
Change-Id: Ib9cc2b64f7ff3c084ef1d7db442db8e7a24a923d
2013-07-26 19:33:54 -07:00
Mathias Agopian
9f213c8b64 Merge changes I487d4eef,Ia750811f
* changes:
  get rid of PixelFormatInfo and simplify things
  get rid of PIXEL_FORMAT_A_8
2013-07-26 20:56:23 +00:00
Mathias Agopian
2ca204e4c0 get rid of PixelFormatInfo and simplify things
Change-Id: I487d4eef7db0095ace4babf5bb100a8769711257
2013-07-25 19:25:10 -07:00
Scott Main
a06cba19c9 am 8d9a4bd1: am 174dd066: Merge "remove link to renderscript support library" into jb-mr2-ub-dev
* commit '8d9a4bd1eb09cc795bf96c4f3a2824f9642c70e4':
  remove link to renderscript support library
2013-07-24 16:26:43 -07:00
Scott Main
d2d43b9647 remove link to renderscript support library
Change-Id: If8e693239b92058c0a2928e0811870bec3a150fe
2013-07-23 21:08:30 -07:00
Chris Craik
9c2cde0583 Use IllegaleStateException to be consistent with rest of Bitmap class
Change-Id: Idd1c77f92eafa8a43619d27a9567382447540e5f
2013-07-23 14:14:45 -07:00
Mathias Agopian
d84feebba4 Merge "update to new Consumer APIs" 2013-07-20 01:03:22 +00:00
Chris Craik
ef5498edf6 Merge "Add reconfigure method to Bitmap" 2013-07-18 22:55:44 +00:00