1081 Commits

Author SHA1 Message Date
Scott Main
11f1c5b89a am b3a57191: am 0a00de11: am 805d2e2d: am 00f49084: Merge "docs: fix renderscript links that currently require redirect" into jb-mr1-dev
# Via Android Git Automerger (3) and others
* commit 'b3a57191e62e0c394ba4a3448770853a1fb7ac3b':
  docs: fix renderscript links that currently require redirect
2013-02-06 12:26:46 -08:00
Scott Main
805d2e2d98 am 00f49084: Merge "docs: fix renderscript links that currently require redirect" into jb-mr1-dev
# Via Android (Google) Code Review (1) and Scott Main (1)
* commit '00f490844d89b146e5490204a5a483834950c489':
  docs: fix renderscript links that currently require redirect
2013-02-06 12:19:30 -08:00
Scott Main
b47fa1699a docs: fix renderscript links that currently require redirect
Change-Id: Ie12ff2c4be5ca22ac43dfe3a16868c7bef8e4ae8
2013-02-05 14:23:13 -08:00
Kenny Root
c3ee1d9aea am 7ad885e2: Merge "One more fix for incorrect indices."
# By Stephen Hines
# Via Gerrit Code Review (1) and Stephen Hines (1)
* commit '7ad885e2e6c845dbec4f16cd71e859240741dbf9':
  One more fix for incorrect indices.
2013-01-29 22:56:40 -08:00
Christopher Tate
0e95685ff4 am b5a72043: Merge "Fix array index oob in Matrix3f.loadRotate()."
* commit 'b5a7204313447101ad80c0c6015e930f1e6b1013':
  Fix array index oob in Matrix3f.loadRotate().
2013-01-22 18:39:55 -08:00
Stephen Hines
3983754bbb One more fix for incorrect indices.
Change-Id: I283f2f09cd0a17eefed4a763b08df856bbae76b3
2013-01-22 18:29:41 -08:00
Stephen Hines
0ce7cdaffd Fix array index oob in Matrix3f.loadRotate().
https://code.google.com/p/android/issues/detail?id=42860

Change-Id: Idbf18576da3ad5b84b4209147dad34cc2f9044d2
2013-01-22 16:01:44 -08:00
Adam Powell
c87b053bf9 am b29dc7e3: am f3a39f2d: Merge "Remove overzealous mutate() sanity check in LayerDrawable" into jb-mr1.1-dev
* commit 'b29dc7e37bc110894cd6287f071f6ba0e4d800a7':
  Remove overzealous mutate() sanity check in LayerDrawable
2012-11-28 11:31:40 -08:00
Adam Powell
bb53dad63b Remove overzealous mutate() sanity check in LayerDrawable
Child drawables of a LayerDrawable should be able to mutate() as a
no-op even if they !canConstantState.

Bug 7622311

Change-Id: I32c00961310f23aaf9ad868c419cbefb9d27a1d2
2012-11-27 11:39:11 -08:00
Chet Haase
cae3eb91e1 am 946facaa: am a004ff88: Merge "Use correct alpha value when a color is not set on a GradientDrawable." into jb-mr1.1-dev
* commit '946facaae149b4408b9b79d2804f4ee2e80c849b':
  Use correct alpha value when a color is not set on a GradientDrawable.
2012-11-26 10:24:55 -08:00
Chet Haase
a004ff880e Merge "Use correct alpha value when a color is not set on a GradientDrawable." into jb-mr1.1-dev 2012-11-26 10:20:30 -08:00
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
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
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
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
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
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
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
Stephen Hines
5b4f8f90fd Convert one more bind() -> setVar().
Bug: 7318821
Change-Id: I215c70a99c81e560a73412b2263fed39a0fdae03
2012-10-16 13:19:23 -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
Tim Murray
091f7ccf9a Fix cycle detection for SGs.
bug 7318821

Change-Id: I695d7230551d8512c6c3f0c31c57f12498da7036
2012-10-12 12:07:09 -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
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
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
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
833a89c694 Merge "Fix range on blur intrinsic." into jb-mr1-dev 2012-10-03 16:02:42 -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
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
2effc77c9a Merge "Update APIs to JB MR1 level 17." into jb-mr1-dev 2012-09-30 12:22:50 -07:00
Dianne Hackborn
fc4947491f Update APIs to JB MR1 level 17.
17 is current, resources are fixed, cleanup is done.

Change-Id: I6de446e209f59c5dd5fe1cde311776ab222817ea
2012-09-30 11:24:23 -07:00
Romain Guy
885d82d427 reset() should reset. Otherwise it would be called something else.
Bug #7256095

Change-Id: I610bbcaccdceaf2b5bb5f9d231283335911d4cd9
2012-09-28 19:24:37 -07:00
Tim Murray
74478f73b7 fix blend intrinsics, add tests
Bug: 7190126
Change-Id: If69213377282bf5b412508e7af974a1f8d440287
2012-09-26 16:29:08 -07:00
Jason Sams
f70bb04346 Add Blend intrinsic.
Change-Id: I6f679c910fc23fe7441e17ad66bcf5f3dd7425a0
2012-09-21 16:10:49 -07:00
Derek Sollenberger
cd77583ed3 Ensure that the decoder is thread-safe.
This prevents issues where one thread recycles the decoder while another
thread is in the process of checking the decoder's status or in the process
of decoding a region.

bug: 6880937
Change-Id: I7f755bf2149d03594e528ca79c536713b1447a55
2012-09-21 08:19:05 -04:00
Jason Sams
55db6865ef Merge "Clean up and publish the YUV to RGB intrinsic." into jb-mr1-dev 2012-09-18 18:43:52 -07:00
Jason Sams
e69e9e6b6e Clean up and publish the YUV to RGB intrinsic.
Change-Id: Iffb346a5d751f0bae123455869bda8db37d542ff
2012-09-18 18:23:15 -07:00
Romain Guy
684385ddde mutate() didn't work as advertised
Bug #7162705

Change-Id: I15b2663fa7f1c71a2a3479134b8b7f37bfcbc607
2012-09-18 16:56:11 -07:00
Romain Guy
29d0aa73a0 Merge "Compute GradientDrawable's opacity correctly" into jb-mr1-dev 2012-09-18 15:39:30 -07:00
Romain Guy
e91aa0fa64 Compute GradientDrawable's opacity correctly
The current implementation of GradientDrawable always assumes the shape needs
to be blended. This causes all windows to be considered translucent by default.
This change recomputes the opacity as needed to ensure windows are marked
opaque when they should.

Change-Id: Iaf291d889a6c5122ab00c9f5781df3e7f61547fa
2012-09-18 15:37:24 -07:00