summaryrefslogtreecommitdiffstats
path: root/graphics
Commit message (Collapse)AuthorAgeFilesLines
* Add support for Bitmap-backed Allocations in Java.Tim Murray2012-12-043-0/+45
| | | | | Change-Id: Iab38a275aa6cdac91c76fa0d134fbc1e8f387913 Bug: 7256604
* am c87b053b: am b29dc7e3: am f3a39f2d: Merge "Remove overzealous mutate() ↵Adam Powell2012-11-281-4/+0
|\ | | | | | | | | | | | | sanity check in LayerDrawable" into jb-mr1.1-dev * commit 'c87b053bf92bf39644b554673bc4480606df57e3': Remove overzealous mutate() sanity check in LayerDrawable
| * am b29dc7e3: am f3a39f2d: Merge "Remove overzealous mutate() sanity check in ↵Adam Powell2012-11-281-4/+0
| |\ | | | | | | | | | | | | | | | | | | LayerDrawable" into jb-mr1.1-dev * commit 'b29dc7e37bc110894cd6287f071f6ba0e4d800a7': Remove overzealous mutate() sanity check in LayerDrawable
| | * Remove overzealous mutate() sanity check in LayerDrawableAdam Powell2012-11-271-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Child drawables of a LayerDrawable should be able to mutate() as a no-op even if they !canConstantState. Bug 7622311 Change-Id: I32c00961310f23aaf9ad868c419cbefb9d27a1d2
* | | Merge "Update JNI for strided 2D copies."Tim Murray2012-11-271-5/+5
|\ \ \
| * | | Update JNI for strided 2D copies.Tim Murray2012-11-271-5/+5
| | | | | | | | | | | | | | | | Change-Id: I2453af41a3b974bb0b3c6b1c5a506093f2019e70
* | | | Merge "Add support for face attribute to HTML string resources Bug #7480719"Romain Guy2012-11-271-5/+42
|\ \ \ \
| * | | | Add support for face attribute to HTML string resourcesRomain Guy2012-11-271-5/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #7480719 This change also adds the alias "color" for the attribute "fgcolor". This change also unifies HTML colors parsing between the Html class and StringBlock for consistency. Change-Id: I696a6e080387901d88e9baf7cb989b892f14b9db
* | | | | Undeprecate linear text APIRomain Guy2012-11-271-2/+0
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Hardware renderer support pending, but this API should not have been deprecated in the first place. Change-Id: I062dac6d65dffb5369e65d55ea159594a0971b59
* | | | Merge "Add new mipMap attribute to BitmapDrawable"Romain Guy2012-11-271-2/+46
|\ \ \ \
| * | | | Add new mipMap attribute to BitmapDrawableRomain Guy2012-11-271-2/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This attribute can be used to enable/disable mipmapping on bitmaps. See Bitmap.setHasMipMap() for details. Change-Id: I13cc800a258b6876a94e2a9605dcec4ea4f1ea48
* | | | | Merge "Add single channel blur test."Jason Sams2012-11-261-1/+1
|\ \ \ \ \
| * | | | | Add single channel blur test.Jason Sams2012-11-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iec63132ab4d88290ae1bf0d71431d4fe6ec6dd25
* | | | | | Fix typo in exception messageJonathan Dixon2012-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I85390d7ceae8f89aadd808600a920a1401ef1c3a
* | | | | | Merge "Clarify Bitmap.copyTo/FromPixelBuffer documentation"Romain Guy2012-11-261-0/+8
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Clarify Bitmap.copyTo/FromPixelBuffer documentationRomain Guy2012-11-261-0/+8
| | |/ / / | |/| | | | | | | | | | | | | Change-Id: Ifb410df392a5ad6c83d6744e19aad13b9a4e811d
* | | | | am cae3eb91: am 946facaa: am a004ff88: Merge "Use correct alpha value when a ↵Chet Haase2012-11-261-4/+4
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | color is not set on a GradientDrawable." into jb-mr1.1-dev * commit 'cae3eb91e159a48e2b4ec9ee6339a40212435c2f': Use correct alpha value when a color is not set on a GradientDrawable.
| * | | | am 946facaa: am a004ff88: Merge "Use correct alpha value when a color is not ↵Chet Haase2012-11-261-4/+4
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | set on a GradientDrawable." into jb-mr1.1-dev * commit '946facaae149b4408b9b79d2804f4ee2e80c849b': Use correct alpha value when a color is not set on a GradientDrawable.
| | * | | Merge "Use correct alpha value when a color is not set on a ↵Chet Haase2012-11-261-4/+4
| | |\ \ \ | | | | | | | | | | | | | | | | | | GradientDrawable." into jb-mr1.1-dev
| | | * | | Use correct alpha value when a color is not set on a GradientDrawable.Chet Haase2012-11-211-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | am 713bebda: am 6225b881: am 18bbcf7f: Merge "Copy missing state in ↵Romain Guy2012-11-261-0/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DrawableContainer" into jb-mr1.1-dev * commit '713bebdac508bb8e6fb0866f4cae873806dad459': Copy missing state in DrawableContainer
| * | | | | am 6225b881: am 18bbcf7f: Merge "Copy missing state in DrawableContainer" ↵Romain Guy2012-11-261-0/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1.1-dev * commit '6225b881875e2ae3f84b7fa2e9e090f018f32972': Copy missing state in DrawableContainer
| | * | | | Merge "Copy missing state in DrawableContainer" into jb-mr1.1-devRomain Guy2012-11-261-0/+2
| | |\ \ \ \
| | | * | | | Copy missing state in DrawableContainerRomain Guy2012-11-201-0/+2
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | am eb673855: am f57eaa02: am ce180c10: Merge "Cleanup: add ↵Romain Guy2012-11-262-10/+44
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | | | | | | | | | | | PointF.toString()/equals()/hashcode()" into jb-mr1.1-dev * commit 'eb673855a2204e81108bfe3f481a32a347b61db9': Cleanup: add PointF.toString()/equals()/hashcode()
| * | | | am f57eaa02: am ce180c10: Merge "Cleanup: add ↵Romain Guy2012-11-262-10/+44
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | PointF.toString()/equals()/hashcode()" into jb-mr1.1-dev * commit 'f57eaa02ea00e538d3d5dc2b4a39831ac3e07db8': Cleanup: add PointF.toString()/equals()/hashcode()
| | * | | Cleanup: add PointF.toString()/equals()/hashcode()Romain Guy2012-11-202-10/+44
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am 29fd706a: am d5f2a8d9: am 89ac38bf: Merge "Add missing variable copies in ↵Chris Craik2012-11-201-0/+8
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | Path copy constructor" into jb-mr1.1-dev * commit '29fd706aa1a59d542b30672a3a5d6d9cf6c34980': Add missing variable copies in Path copy constructor
| * | am d5f2a8d9: am 89ac38bf: Merge "Add missing variable copies in Path copy ↵Chris Craik2012-11-201-0/+8
| |\ \ | | |/ | | | | | | | | | | | | | | | constructor" into jb-mr1.1-dev * commit 'd5f2a8d9ee4e5ef3eeece3376ed414d83919fccf': Add missing variable copies in Path copy constructor
| | * Add missing variable copies in Path copy constructorChris Craik2012-11-161-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | bug:7564602 Also, clear isSimplePath flag for possible translates, since rect drawing path doesn't support them Change-Id: Ibb4a3e87ace0feb16bce1c6032016c5f4643f8d6
* | | am 58ed5d74: am 768d9e1a: Merge "Correct executable bit for source files"Kenny Root2012-11-071-0/+0
|\ \ \ | |/ / | | | | | | | | | * commit '58ed5d748c0b9b64845975ef5844ad313de7c3f6': Correct executable bit for source files
| * | am 768d9e1a: Merge "Correct executable bit for source files"Kenny Root2012-11-071-0/+0
| |\ \ | | |/ | |/| | | | | | | * commit '768d9e1a72ceee7d4a5f608776b87b62d6ce4a04': Correct executable bit for source files
| | * Correct executable bit for source filesKenny Root2012-11-071-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * DO NOT MERGE: Remove a few left-over layout direction things.Dianne Hackborn2012-05-181-0/+1
| | | | | | | | | | | | Change-Id: Id66b171594af939df4716aa0e0baa25fe47eecee
* | | Merge "Updated android.graphics.SurfaceTexture to use wp for ↵Igor Murashkin2012-11-051-1/+2
|\ \ \ | | | | | | | | | | | | FrameAvailableListener"
| * | | Updated android.graphics.SurfaceTexture to use wp for FrameAvailableListenerIgor Murashkin2012-10-301-1/+2
| | | | | | | | | | | | | | | | | | | | Bug: 7425644 Change-Id: I7ccdc0ef421df7240d6cff9222c37411b1ecaf01
* | | | am 06da2423: am 54385d91: am c01d1045: Merge "Fix for bug 7400445 regression ↵Raph Levien2012-10-311-0/+5
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | in background drawable" into jb-mr1-dev * commit '06da2423c55bc2a61b42cdc34c0c20800fdd4977': Fix for bug 7400445 regression in background drawable
| * | Fix for bug 7400445 regression in background drawableRaph Levien2012-10-311-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am 85c1aef9: am 6534dd02: am 74261d84: Merge "Don\'t null the reference to ↵Chet Haase2012-10-221-4/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | 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
| * | Don't null the reference to Bitmap pixels until we're really readyChet Haase2012-10-221-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am b7b30eb0: am fa71ba2c: am 1b85122b: Merge "Add API to enable mipmaps on ↵Romain Guy2012-10-161-1/+48
|\ \ \ | |/ / | | | | | | | | | | | | | | | Bitmap Bug #7353771" into jb-mr1-dev * commit 'b7b30eb0577e794c744a1e3e3079325f73081c3d': Add API to enable mipmaps on Bitmap Bug #7353771
| * | Merge "Add API to enable mipmaps on Bitmap Bug #7353771" into jb-mr1-devRomain Guy2012-10-161-1/+48
| |\ \
| | * | Add API to enable mipmaps on BitmapRomain Guy2012-10-161-1/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #7353771 This API can be used when scaling large images down to a small size to get nicer looking results. Change-Id: If09087eed36077eee5355f6047a3ca67747d7d9e
* | | | am f5e768c4: am 06b9df47: am 61759d99: Merge "Convert one more bind() -> ↵Jason Sams2012-10-161-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | setVar()." into jb-mr1-dev * commit 'f5e768c46dfaa7266a25cf9ea778479b5d493dc1': Convert one more bind() -> setVar().
| * | | Convert one more bind() -> setVar().Stephen Hines2012-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 7318821 Change-Id: I215c70a99c81e560a73412b2263fed39a0fdae03
* | | | am 749c179e: am 8d0c431a: am 009d5413: Merge "Fix bugs in scriptGroup." into ↵Jason Sams2012-10-164-4/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit '749c179ed5a1cdb2f6742fbe3bb491404a19acca': Fix bugs in scriptGroup.
| * | | Fix bugs in scriptGroup.Jason Sams2012-10-154-4/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am bc265564: am 08dd6d1f: am 56754193: Merge "Fix cycle detection for SGs." ↵Jason Sams2012-10-121-29/+13
|\ \ \ | |/ / | | | | | | | | | | | | | | | into jb-mr1-dev * commit 'bc265564746f7321e1d8277449a90c9e8e4ad824': Fix cycle detection for SGs.
| * | Fix cycle detection for SGs.Tim Murray2012-10-121-29/+13
| | | | | | | | | | | | | | | | | | bug 7318821 Change-Id: I695d7230551d8512c6c3f0c31c57f12498da7036
* | | am 6aa40ac5: am fa6e9cf6: am 86ad8662: Merge "Don\'t scale bitmaps to an ↵Romain Guy2012-10-111-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | 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