1395 Commits

Author SHA1 Message Date
Romain Guy
713bebdac5 am 6225b881: am 18bbcf7f: Merge "Copy missing state in DrawableContainer" into jb-mr1.1-dev
* commit '6225b881875e2ae3f84b7fa2e9e090f018f32972':
  Copy missing state in DrawableContainer
2012-11-26 09:49:54 -08:00
Romain Guy
eb673855a2 am f57eaa02: am ce180c10: Merge "Cleanup: add PointF.toString()/equals()/hashcode()" into jb-mr1.1-dev
* commit 'f57eaa02ea00e538d3d5dc2b4a39831ac3e07db8':
  Cleanup: add PointF.toString()/equals()/hashcode()
2012-11-26 09:49:51 -08:00
Romain Guy
18bbcf7f68 Merge "Copy missing state in DrawableContainer" into jb-mr1.1-dev 2012-11-26 09:45:29 -08:00
Chet Haase
813680780f Use correct alpha value when a color is not set on a GradientDrawable.
A previous fix ensured that color filters would have a default (black) color to
interact with if no color was set on the GradientDrawable object. However, that fix
assumed an opaque alpha value, which is not always the case. Specifically, calling
setImageAlpha() on an ImageView with a shape drawable source (as in the bug here)
caused the alpha to be set to a translucent value, which was then ignored in the fix
above.

The fix is to account for the current alpha value of the GradientDrawable object
when setting the color used by the paint object.

Issue #7592193 ImageView.setImageAlpha() broken when colorFilter is in use

Change-Id: Ie622ffca776fdd8731ced78ce1f683ca6a51dec8
2012-11-21 11:21:13 -08:00
Romain Guy
9f8af6546d Cleanup: add PointF.toString()/equals()/hashcode()
PointF was missing these methods found in Point.

This change also properly implements equals() and hashcode() for
Point to match the PointF implementations.

Change-Id: Ic97280fb9f8c7011d8a13103c67d6e898adf00c0
2012-11-20 18:35:20 -08:00
Romain Guy
fa9b396dbc Copy missing state in DrawableContainer
The copy constructor of DrawableContainerState was not properly
copying all the state. This change adds the missing two fields
that should be copied over.

Change-Id: Ic92ba17ccf8fb3c8cbb5ead18690287da21c48a4
2012-11-20 18:32:37 -08:00
Chris Craik
1fc3c5f22f am 29fd706a: am d5f2a8d9: am 89ac38bf: Merge "Add missing variable copies in Path copy constructor" into jb-mr1.1-dev
* commit '29fd706aa1a59d542b30672a3a5d6d9cf6c34980':
  Add missing variable copies in Path copy constructor
2012-11-20 11:48:08 -08:00
Chris Craik
29fd706aa1 am d5f2a8d9: am 89ac38bf: Merge "Add missing variable copies in Path copy constructor" into jb-mr1.1-dev
* commit 'd5f2a8d9ee4e5ef3eeece3376ed414d83919fccf':
  Add missing variable copies in Path copy constructor
2012-11-20 11:44:49 -08:00
Jason Sams
8150941098 Add single channel blur test.
Change-Id: Iec63132ab4d88290ae1bf0d71431d4fe6ec6dd25
2012-11-16 18:05:10 -08:00
Chris Craik
fa0853e0b9 Add missing variable copies in Path copy constructor
bug:7564602

Also, clear isSimplePath flag for possible translates, since rect drawing path
doesn't support them

Change-Id: Ibb4a3e87ace0feb16bce1c6032016c5f4643f8d6
2012-11-16 16:09:33 -08:00
Kenny Root
7b172a49a9 am 58ed5d74: am 768d9e1a: Merge "Correct executable bit for source files"
* commit '58ed5d748c0b9b64845975ef5844ad313de7c3f6':
  Correct executable bit for source files
2012-11-07 13:08:25 -08:00
Kenny Root
58ed5d748c am 768d9e1a: Merge "Correct executable bit for source files"
* commit '768d9e1a72ceee7d4a5f608776b87b62d6ce4a04':
  Correct executable bit for source files
2012-11-07 11:52:12 -08:00
Kenny Root
3a084af2e9 Correct executable bit for source files
Many media files and source code files were marked as executable in Git.
Remove those.

Also a shell script and python script were not marked as executable.

Change-Id: Ieb51bafb46c895a21d2e83696f5a901ba752b2c5
2012-11-07 10:27:31 -08:00
Igor Murashkin
1a94c7db9f Merge "Updated android.graphics.SurfaceTexture to use wp for FrameAvailableListener" 2012-11-05 13:47:56 -08:00
Raph Levien
097d818ceb am 06da2423: am 54385d91: am c01d1045: Merge "Fix for bug 7400445 regression in background drawable" into jb-mr1-dev
* commit '06da2423c55bc2a61b42cdc34c0c20800fdd4977':
  Fix for bug 7400445 regression in background drawable
2012-10-31 16:41:59 -07:00
Raph Levien
39824f685c Fix for bug 7400445 regression in background drawable
The opacity calculation for a gradient drawable of shape must take
rounded corners into account - if the corner radius is nonzero, then the
shape is translucent rather than opaque. Previously the code always
assumed that such rectangles were fully opaque, which led to the
background (visible behind the rectangle) not getting drawn.

This patch simply checks for corner radius in addition to shape and
computes opacity as translucent in the nonzero case.

Change-Id: Iaf4d24abc6ecf49f85c82972b8f998700c83295e
2012-10-31 13:59:02 -07:00
Igor Murashkin
c99db2bc46 Updated android.graphics.SurfaceTexture to use wp for FrameAvailableListener
Bug: 7425644
Change-Id: I7ccdc0ef421df7240d6cff9222c37411b1ecaf01
2012-10-30 14:44:25 -07:00
Chet Haase
aaee13176e am 85c1aef9: am 6534dd02: am 74261d84: Merge "Don\'t null the reference to Bitmap pixels until we\'re really ready" into jb-mr1-dev
* commit '85c1aef929b40f6fae31938b9c71160865d67f81':
  Don't null the reference to Bitmap pixels until we're really ready
2012-10-22 15:55:08 -07:00
Chet Haase
547e66531d Don't null the reference to Bitmap pixels until we're really ready
A change in the VM triggers a native memory error more aggressively than before,
showing that there's a bug in the logic of recycling bitmaps. Since the pixel
memory is allocated on the Java heap, nulling out the reference to that memory
in the Java level Bitmap object can cause that memory to get collected at any time.
Meanwhile, we may have a reference to that memory at the native level for rendering
purposes, causing an error if/when we access that memory after it has been collected
by the VM.

The fix is to avoid setting the reference to the pixels to null unless we are
not referring to it in native code. This is determined at the time we call
recycle() - we return a boolean to indicate whether the native code is still
using the memory. if not, the Java code can null out the reference and allow the
VM to collect it. Otherwise, it will get collected later when the encompassing
Bitmap object is collected.

Issue #7339156 HTML5 tests crash the app (Vellamo)

Change-Id: I3a0d6b9a6c5dd3b86cc2b0ff7719007e774b5e3c
2012-10-22 15:25:19 -07:00
Romain Guy
ef9f40f11e am b7b30eb0: am fa71ba2c: am 1b85122b: Merge "Add API to enable mipmaps on Bitmap Bug #7353771" into jb-mr1-dev
* commit 'b7b30eb0577e794c744a1e3e3079325f73081c3d':
  Add API to enable mipmaps on Bitmap Bug #7353771
2012-10-16 19:14:13 -07:00
Romain Guy
1b85122bd2 Merge "Add API to enable mipmaps on Bitmap Bug #7353771" into jb-mr1-dev 2012-10-16 19:05:49 -07:00
Romain Guy
713e1bb9df Add API to enable mipmaps on Bitmap
Bug #7353771

This API can be used when scaling large images down to a small size
to get nicer looking results.

Change-Id: If09087eed36077eee5355f6047a3ca67747d7d9e
2012-10-16 18:44:09 -07:00
Jason Sams
7e7b99ca93 am f5e768c4: am 06b9df47: am 61759d99: Merge "Convert one more bind() -> setVar()." into jb-mr1-dev
* commit 'f5e768c46dfaa7266a25cf9ea778479b5d493dc1':
  Convert one more bind() -> setVar().
2012-10-16 13:33:28 -07:00
Stephen Hines
5b4f8f90fd Convert one more bind() -> setVar().
Bug: 7318821
Change-Id: I215c70a99c81e560a73412b2263fed39a0fdae03
2012-10-16 13:19:23 -07:00
Jason Sams
885934ff45 am 749c179e: am 8d0c431a: am 009d5413: Merge "Fix bugs in scriptGroup." into jb-mr1-dev
* commit '749c179ed5a1cdb2f6742fbe3bb491404a19acca':
  Fix bugs in scriptGroup.
2012-10-16 10:58:03 -07:00
Jason Sams
e6a7886674 Fix bugs in scriptGroup.
Intrinsics were treating inputs as fields rather than varObjs.
This would generate a lot of extra work for the reflection
layers. Also we would like to deprecate this path in the future.

bug 7318821

Change-Id: I81e8c562ba05aae5d085d5c08e91e2c4877265c5
2012-10-15 15:52:22 -07:00
Jason Sams
1592c79a40 am bc265564: am 08dd6d1f: am 56754193: Merge "Fix cycle detection for SGs." into jb-mr1-dev
* commit 'bc265564746f7321e1d8277449a90c9e8e4ad824':
  Fix cycle detection for SGs.
2012-10-12 19:11:54 -07:00
Tim Murray
091f7ccf9a Fix cycle detection for SGs.
bug 7318821

Change-Id: I695d7230551d8512c6c3f0c31c57f12498da7036
2012-10-12 12:07:09 -07:00
Romain Guy
5ce5cdb6ac am 6aa40ac5: am fa6e9cf6: am 86ad8662: Merge "Don\'t scale bitmaps to an empty size when targetDpi=0 Bug #7334217" into jb-mr1-dev
* commit '6aa40ac59516d4286b2013e33b9f37633ec0fe91':
  Don't scale bitmaps to an empty size when targetDpi=0 Bug #7334217
2012-10-11 17:53:35 -07:00
Romain Guy
86ad866283 Merge "Don't scale bitmaps to an empty size when targetDpi=0 Bug #7334217" into jb-mr1-dev 2012-10-11 15:50:17 -07:00
Romain Guy
0b68477f82 Don't scale bitmaps to an empty size when targetDpi=0
Bug #7334217

Change-Id: I8d232a835580ffbf85334e0a3580e8d8240c8570
2012-10-11 15:11:22 -07:00
Tim Murray
07fd8b4fc5 am b97bf6c4: am ab01a9e4: am b2d55225: Merge "Add DAG validation for ScriptGroups." into jb-mr1-dev
* commit 'b97bf6c458689a5e4284b902f0c012b4ebe273b0':
  Add DAG validation for ScriptGroups.
2012-10-10 17:42:41 -07:00
Tim Murray
b2d552259e Merge "Add DAG validation for ScriptGroups." into jb-mr1-dev 2012-10-10 17:35:12 -07:00
Tim Murray
2a603897c6 Add DAG validation for ScriptGroups.
bug 7318821

Change-Id: If13cfe7a9f214ab253236bd52dd96df7b07aa14e
2012-10-10 14:21:46 -07:00
Marco Nelissen
91d7b4f326 am 0419ebaf: am 450b713e: am 437e9cc3: Merge "Adjust buffer position after copying" into jb-mr1-dev
* commit '0419ebafbac72ccbcb53a68b24e29265962f50fd':
  Adjust buffer position after copying
2012-10-10 08:42:23 -07:00
Marco Nelissen
55adc145d4 Adjust buffer position after copying
Make Bitmap.copyPixelsFromBuffer() adjust the buffer's position,
making it consistent with Bitmap.copyPixelsToBuffer().
b/6948775

Change-Id: Ie26f8050b1fb4d19cd39ee1a08b6f652a732fec3
2012-10-08 09:15:46 -07:00
Tim Murray
f671fb0b35 Add copyFrom(Allocation a).
Change-Id: Ibc334326083b5471584dcf1c068e4e810aede20f
2012-10-05 16:45:45 -07:00
Tim Murray
bc254b9597 add resize2D to Java API
Change-Id: I91c0d2292486d63b93f8b07a9ec0137fe020ac21
2012-10-05 16:15:16 -07:00
Romain Guy
82fa5ffbbc am bf8d8e73: am 5971d03f: am f7ee2a03: Merge "Fix rendering artifacts on tiled renderers Bug #7275145" into jb-mr1-dev
* commit 'bf8d8e73e4123f529845e88de6d74b62853b9786':
  Fix rendering artifacts on tiled renderers Bug #7275145
2012-10-03 18:53:48 -07:00
Romain Guy
f7ee2a03c1 Merge "Fix rendering artifacts on tiled renderers Bug #7275145" into jb-mr1-dev 2012-10-03 18:47:35 -07:00
Romain Guy
dfab363807 Fix rendering artifacts on tiled renderers
Bug #7275145

This change fixes ViewRoot and adds extra debug information. It does
not solve the problem entirely. Another CL will.

Change-Id: I7e604ba38aad7f421769783dcbd998d6905ab2d9
2012-10-03 18:07:59 -07:00
Jason Sams
5020d82cf2 am f055f943: am 4bc2bd51: am 833a89c6: Merge "Fix range on blur intrinsic." into jb-mr1-dev
* commit 'f055f94388d540d0588ed1b3e35e37b2d0247f94':
  Fix range on blur intrinsic.
2012-10-03 16:10:26 -07:00
Jason Sams
833a89c694 Merge "Fix range on blur intrinsic." into jb-mr1-dev 2012-10-03 16:02:42 -07:00
Romain Guy
aba58b519f am f265ac2e: am 27fa88dd: am 0e3984b7: Merge "Bring back Netflix progress bar Bug #7274157" into jb-mr1-dev
* commit 'f265ac2e26811561a786a4710ec8d992c05563b5':
  Bring back Netflix progress bar Bug #7274157
2012-10-02 16:26:59 -07:00
Romain Guy
41c769d9a8 Bring back Netflix progress bar
Bug #7274157

Gradients and color filters are multiplied by the paint's color so it
needs to be set to opaque black to have an effect.

Change-Id: Ib5dd1e6185f758f55b57a0f4496dfae98f1a096b
2012-10-02 16:04:05 -07:00
Jason Sams
31864d76a3 Fix range on blur intrinsic.
The intrinsic fails when the radius was 0. A blur
of radius 0 is a nop and should be disallowed. Fix the
test to allow sub-pixel radius to be selected.

bug 7273437

Change-Id: I2805674e29d557615eb7ac65c7910d4dffa28b58
2012-10-02 15:21:11 -07:00
Romain Guy
964175b862 am 70c68ea5: am 77bcaaad: am 8257124c: Merge "Draw stroked rectangle as meshes instead of textures Bug #7233734" into jb-mr1-dev
* commit '70c68ea5539a968be634ba431595683109153ec4':
  Draw stroked rectangle as meshes instead of textures Bug #7233734
2012-10-02 14:36:43 -07:00
Romain Guy
cf8675ee17 Draw stroked rectangle as meshes instead of textures
Bug #7233734

Stroked rectangles were rendered using software generated textures
which would lead to slightly misaligned results. Instead, let's use
the new convex path rendering code that will do the right thing
(and save a lot of bandwidth.)

Change-Id: Ib95ff581e56c1ecead97e4919298e6fd146ca167
2012-10-02 13:33:10 -07:00
Dianne Hackborn
d847b594e4 am eede0f6f: am b4bca666: am 2effc77c: Merge "Update APIs to JB MR1 level 17." into jb-mr1-dev
* commit 'eede0f6fe0957bf559a01d94a1b4f5444b3743b5':
  Update APIs to JB MR1 level 17.
2012-10-01 11:17:08 -07:00
Romain Guy
302b74c9a2 am b9a0a231: am dd2dd7bb: am 955b66d0: Merge "reset() should reset. Otherwise it would be called something else. Bug #7256095" into jb-mr1-dev
* commit 'b9a0a23111b4f82004a6a321e8de9f1ad474e387':
  reset() should reset. Otherwise it would be called something else. Bug #7256095
2012-10-01 11:16:40 -07:00