summaryrefslogtreecommitdiffstats
path: root/graphics
Commit message (Collapse)AuthorAgeFilesLines
* am abf701e6: Merge "Eliminate mHasAlpha" into klp-devJohn Reck2014-03-211-15/+3
|\ | | | | | | | | * commit 'abf701e6751aed487d4ed0986e0fae8810c3658f': Eliminate mHasAlpha
| * Eliminate mHasAlphaJohn Reck2014-03-211-15/+3
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 13580771 The cached value mHasAlpha on Bitmap could get out of sync with the real value stored in the SkBitmap. Fix this by just eliminating the cached value. This adds an extra JNI call in copy(), createBitmap(), and setPremultiplied(), none of which are going to be significantly impacted by the extra JNI call. Change-Id: I4fce069a77d9b3bbb47dde04275ff8510ce7e4f0
* | am cf8573c1: Fix destruction issues relating to AllocationAdapter.Jason Sams2014-03-112-2/+2
|\ \ | |/ | | | | | | * commit 'cf8573c15456c4581b691c7380722ea6dccf11c5': Fix destruction issues relating to AllocationAdapter.
| * Fix destruction issues relating to AllocationAdapter.Jason Sams2014-03-102-2/+2
| | | | | | | | | | | | bug 13170046 Change-Id: I2a2ba3cbd7d08c659ed8958fbcc01919e36e86b0
* | am 5757bf89: Add hidden minor version ID for support lib workarounds.Jason Sams2014-03-111-0/+14
|\ \ | |/ | | | | | | * commit '5757bf89c44e7a4805340b5634bec13a1caf39f8': Add hidden minor version ID for support lib workarounds.
| * Add hidden minor version ID for support lib workarounds.Jason Sams2014-03-101-0/+14
| | | | | | | | | | | | bug 13170046 Change-Id: I0c77901752e9a0b10bd5be62311c79a0ab7128e5
* | am ff7256e7: Fix destruction issues relating to AllocationAdapter.Jason Sams2014-03-112-13/+41
|\ \ | |/ | | | | | | * commit 'ff7256e757502279b1777127a12eba235be679ae': Fix destruction issues relating to AllocationAdapter.
| * Fix destruction issues relating to AllocationAdapter.Jason Sams2014-03-102-13/+41
| | | | | | | | | | | | bug 13170046 Change-Id: I922b19c086b675949c6fae66c6dcb4c8af3b715f
* | am 92a32832: DO NOT MERGE - Fix Javadoc build break.Leon Scroggins III2014-03-061-1/+1
|\ \ | |/ | | | | | | * commit '92a3283286df3a6c2a27ecde8eddf23abbb87de9': DO NOT MERGE - Fix Javadoc build break.
| * DO NOT MERGE - Fix Javadoc build break.Leon Scroggins III2014-03-061-1/+1
| | | | | | | | | | | | | | | | Remove links to non-specific function name. Bug: 13246311 Change-Id: I5643074149d0a511bd760d638751c44e3ec4c557 (cherry picked from commit 2bc49ca96eb786f66dc2b9573e1f09bdb2d82d5e)
* | am ee008d42: Merge "Update framework to use M33 Skia. DO NOT MERGE" into klp-devLeon Scroggins III2014-03-062-12/+45
|\ \ | |/ | | | | | | * commit 'ee008d4264a95bba5f90b17856fc06fa29a6f12c': Update framework to use M33 Skia. DO NOT MERGE
| * Update framework to use M33 Skia. DO NOT MERGELeon Scroggins III2014-03-062-12/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (These CLs are already in master.) Bug: 13246311 This cherry-picks 7 CLs: ----------------------------------------------------------------------- Remove calls to deprecated SkBitmap::setIsOpaque() setIsOpaque() has been removed from ToT Skia. Update setters for mIsPremultiplied and hasAlpha to take the other into consideration. cherry-pick from: I1b36b0b0ce7126031eb7b769b563c17dcd4b306a ----------------------------------------------------------------------- Merge AssetStream with AssetStreamAdaptor. Add enums to the constructor for AssetStreamAdaptor to choose the different behaviors used by the (former) two different classes. The old clients of AssetStream now get the following features of AssetStreamAdaptor - Debugging statements on error. - The stream is an SkStreamRewindable. - getLength() returns the correct value, and the old way of getting the length (read(NULL, 0)) is no longer implemented, since it is no longer used. - isAtEnd() returns the correct value. ToT Skia makes it pure virtual, so some implementation is necessary. cherry-pick from: I2a5395914e4f53830aaefee396556459083a1c56 ----------------------------------------------------------------------- Deprecate Android-specific SkPaint functions. The following functions were problematic: const SkGlyph& getUnicharMetrics(SkUnichar, const SkMatrix*); const SkGlyph& getGlyphMetrics(uint16_t, const SkMatrix*); const void* findImage(const SkGlyph&, const SkMatrix*); Replacing them with calls through SkGlyphCache solved a nasty crash bug, so they have all been deprecated. Bug: 11968757 cherry-pick from: Id746315d41aec5b211b78b172a883c2061130f08 ----------------------------------------------------------------------- pass SkGlyphCache into updateGlyphCache() Doing so prevents us from double-locking the glyph cache, thereby effectively locking ourselves out of reusing work that we'd just done. Bug: 11968757 cherry-pick from: I5c552f2d0bbe30af2ce9054ba684e7da756a0d89 ----------------------------------------------------------------------- Updates to the Skia API needed to merge the WebView m33 version of Skia. cherry-pick from: I0f63b53f2aae58871413b132742fc84138f069a3 Bugfix for screenshots (recent apps) due to incorrect rowBytes computation bug: 12915192 cherry-pick from: I4d5fe2a2f75baf66099e0970fb646686a1992714 ----------------------------------------------------------------------- Fix bug in AndroidPixelRef where we did not store the correct imageInfo for a recycled bitmap. cherry-pick from: I882483b78886e2f19fa4e43a86e69f5a82b3b7e5 ----------------------------------------------------------------------- Change-Id: Ie2b731a9f0795802418cfecddb4b684c92c64d33
* | am 9d0a88bd: Merge "Doc updates: Javadoc fixes" into klp-docsKatie McCormick2013-11-261-1/+1
|\ \ | | | | | | | | | | | | * commit '9d0a88bd4e07deac01d7759b70cdf160456be1c0': Doc updates: Javadoc fixes
| * | Doc updates: Javadoc fixesKatie McCormick2013-11-261-1/+1
| | | | | | | | | | | | Change-Id: I82381056f9f13e53ab8a0525f5a53bf98674c052
| * | Doc fix: add more detail to BitmapFactory.Options.inPurgeable flag.Adam Koch2013-11-061-2/+14
| | | | | | | | | | | | | | | | | | Bug: 6064760 Change-Id: I3fd833a3205be451ff6548fab3555d170c9c570e (cherry picked from commit e1693df494dbdedfb5eac56bf59f86afc893b778)
* | | am 90242fe5: Merge "Switch to the new Skia PDF generation APIs." into klp-devSvetoslav2013-11-071-20/+27
|\ \ \ | | |/ | |/| | | | | | | * commit '90242fe5581c8f665c09337a0971a7c3fc908f7c': Switch to the new Skia PDF generation APIs.
| * | Merge "Switch to the new Skia PDF generation APIs." into klp-devSvetoslav2013-11-081-20/+27
| |\ \
| | * | Switch to the new Skia PDF generation APIs.Svetoslav2013-11-071-20/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new Skia PDF generation APIs are a small extension to the code that converts drawing commands to PDF (SkPDFDevice) and this new functionality is exposed via new APIs. This change switches to using these new APIs allowing us to capitalize on the new perspective support for PDF generation. bug:11561776 Change-Id: Ief61f7ff6a5a22c27d3acbe99a48910cb679f594
* | | | am 435c0ee1: Merge "Fix bug #11537133 Hideycling looks broken (KOT36), ↵Fabrice Di Meglio2013-11-072-2/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | missing left padding" into klp-dev * commit '435c0ee10af132937dc0a22c39380624e6efd5ab': Fix bug #11537133 Hideycling looks broken (KOT36), missing left padding
| * | | Merge "Fix bug #11537133 Hideycling looks broken (KOT36), missing left ↵Fabrice Di Meglio2013-11-072-2/+3
| |\ \ \ | | |/ / | |/| | | | | | padding" into klp-dev
| | * | Fix bug #11537133 Hideycling looks broken (KOT36), missing left paddingFabrice Di Meglio2013-11-062-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - enforce the Drawable boolean getPadding(Rect) contract for NinePatchDrawable and DrawableContainer. - as NinePatchDrawable was not enforcing it, the consequence was that the mUserPaddingLeftInitial / mUserPaddingRitghInitial were reset to "0" (even if they got the correct value before the reset). Change-Id: I1efe7fad5f89c0ca47f90189f6d89940e0e9c6ae
* | | | am 47feee53: Merge "Fix some documentation typos." into klp-docsNewton Allen2013-11-073-5/+5
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| * commit '47feee535f9e4e77165b93b6b9f10379e7aa4bbd': Fix some documentation typos.
| * | Fix some documentation typos.Newton Allen2013-11-013-5/+5
| | | | | | | | | | | | Change-Id: I0360d468d54d970c87f313e24e50965245206f28 (cherry picked from commit c502744f2ddcc80a34f5197b5d2c0d701c7d6e71)
| * | Update the PdfDocument docs with unsupported operations.Svetoslav Ganov2013-10-311-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | The PDF generating canvas we use does not yet support all drawing operations. This change adds docs which operations are not yet supported. Change-Id: I8d5ee8c1e2a473ba783b5e62f23ab90a54bbf106 (cherry picked from commit 8db45b844b5482cf61839404c0f6847e053de817)
* | | Merge "Fix NPE with inPurgeable Bitmaps in getAllocationByteCount" into klp-devChris Craik2013-11-061-0/+5
|\ \ \
| * | | Fix NPE with inPurgeable Bitmaps in getAllocationByteCountChris Craik2013-11-061-0/+5
| |/ / | | | | | | | | | | | | bug:11556330 Change-Id: I430136ea15baeb60adfb9bb2acdde9505ce707fe
* | | Merge "Fix recent regression in DrawableContainer." into klp-devJohn Spurlock2013-11-061-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix recent regression in DrawableContainer.John Spurlock2013-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | Ensure optical insets are never null. Bug:11537082 Change-Id: Ib75be83909fac612ae947f501835285cd8a79862
* | | Merge "Doc fix: add more detail to BitmapFactory.Options.inPurgeable flag. ↵Adam Koch2013-11-061-2/+14
|\ \ \ | |/ / |/| | | | | Bug: 6064760" into klp-dev
| * | Doc fix: add more detail to BitmapFactory.Options.inPurgeable flag.Adam Koch2013-11-051-2/+14
| | | | | | | | | | | | | | | | | | Bug: 6064760 Change-Id: I3fd833a3205be451ff6548fab3555d170c9c570e
* | | Merge "Fix bug #11256076 Spinner text is too close from the opening triangle ↵Fabrice Di Meglio2013-11-051-6/+25
|\ \ \ | |/ / |/| | | | | in RTL Locales" into klp-dev
| * | Fix bug #11256076 Spinner text is too close from the opening triangle in RTL ↵Fabrice Di Meglio2013-10-181-6/+25
| |/ | | | | | | | | | | | | | | | | | | | | Locales Background Drawable padding was not taken into account in RTL Locales - make sure the Drawables are resolved before resolving padding - during padding resolution take care about background padding Change-Id: Ib0c722adf5341ab4fa2182a0d0ac2ca639e85cfc
* | Update the PdfDocument docs with unsupported operations.Svetoslav Ganov2013-10-311-0/+25
|/ | | | | | | | The PDF generating canvas we use does not yet support all drawing operations. This change adds docs which operations are not yet supported. Change-Id: I8d5ee8c1e2a473ba783b5e62f23ab90a54bbf106
* DO NOT MERGE: Hide new camera API.Eino-Ville Talvala2013-10-111-4/+2
| | | | | | | | Not yet ready. Bug: 11141002 Change-Id: I4704bffb9ba36af47a66dc5b49cbba00be623aae
* Use SCREEN Xfermode for keyguard badges; update SeekBarAdam Powell2013-10-072-0/+19
| | | | | | | | | | | | | | | Plumb through the necessary API features through Drawables and ImageView but leave it hidden for now pending future API review and plumbing through the rest of the framework Drawable implementations. Update SeekBar assets used for keyguard transport control. Set selected status directly instead of finding views by id. Bug 10531608 Bug 10784913 Change-Id: Ia38bd04ad1bc26e9e6da1dda8a374c9ba3ceccb3
* Preserve fill type in Path.reset().Mike Klein2013-10-072-0/+41
| | | | | Bug: 10838355 Change-Id: I7bdecb945fc35dfed02d37745678ae7bda906628
* Fix animations, padding in RTL mode.Jeff Sharkey2013-10-012-7/+25
| | | | | | | | | | Show directory animations coming in from left-side when in RTL language. Also fix NinePatchDrawable to correctly mirror its padding when auto-mirrored, and fix InsetDrawable to propagate the layout direction to the wrapped Drawable. Bug: 10987190, 11030793 Change-Id: I1213802a07d0c4ced93438df1e6ddf5aed3df677
* Merge "clarify Paint flag docs" into klp-devVictoria Lease2013-09-261-12/+102
|\
| * clarify Paint flag docsVictoria Lease2013-09-261-12/+102
| | | | | | | | | | Bug: 10460797 Change-Id: Iae622b302cad3dc788f512b472e3a59ec227a8d7
* | Update docs to state that mark is no longer called.Leon Scroggins III2013-09-252-0/+10
|/ | | | | | BUG:6493544 Change-Id: I97a4d90ce2efcd12f8f1cc5b545f822f8e5a5ab0
* Move PdfDocument to android.graphics.pdfSvetoslav2013-09-192-0/+429
| | | | | | | | | | | | | | | 1. Move PdfDocument to android.graphics.pdf. 2. Changed the PdfDocument as per API concil request. 3. Updated the documentation. bug:10461180 bug:10552565 bug:10681585 bug:10552336 Change-Id: I08e15b34cf37bb064248c887e6f59808019cafe8
* Use a native buffer for decoding images.Leon Scroggins III2013-09-182-12/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes BUG:10725383 Depends on https://googleplex-android-review.git.corp.google.com/#/c/357300/ in external/skia. In the previous fix for BUG:8432093 and BUG:6493544 (https://googleplex-android-review.googlesource.com/#/c/346191/), instead of calling mark on the provided input stream, we copied the entire stream in native code (except in one case; more details below), allowing rewind no matter how much of the stream had been read. This was because two decoders may rewind after reading an arbitrary amount of the stream: SkImageDecoder_wbmp and SkImageDecoder_libjpeg. It turns out that the jpeg decoder does not need this rewind after arbitrary length (it is a failure recovery case, and libjpeg has a default recovery we can use - the above referenced CL in Skia uses the default). Although the wbmp decoder could read any amount given a stream with the "right" data, and then return false, such a stream would not be a valid stream of another format, so it is okay for this rewind to fail. Further, the previous fix was inefficient in the common case where the caller decodes just the bounds, resets, then decodes the entire image (since we have copied the entire stream twice). The copy also resulted in the crashes seen in BUG:10725383. In this CL, buffer only the amount of input needed by SkImageDecoder::Factory to determine the type of image decoder needed. Do not mark the input stream provided by the caller, so their mark (if any) can remain in tact. The new Skia class SkFrontBufferedStream allows buffering just the beginning of the stream. core/jni/android/graphics/BitmapFactory.cpp: Instead of calling GetRewindableStream (which has been removed), call CreateJavaInputStreamAdaptor. Then wrap it in an SkFrontBufferedStream, with a large enough buffer to determine which type of image is used. core/jni/android/graphics/CreateJavaOutputStreamAdaptor.h: core/jni/android/graphics/CreateJavaOutputStreamAdaptor.cpp: Remove mark, markSupported, and rewind. CreateJavaInputStreamAdaptor now turns an SkStream which is not rewindable. If the caller needs rewind that needs to be handled differently (for example, by using SkFrontBufferedStream, as is done in BitmapFactory and Movie. Remove RewindableJavaStream and GetRewindableStream. Remove code specific to ByteArrayInputStream, which makes slow JNI calls. Instead, depend on the caller to buffer the input in the general case. There is no reason to special case this stream (especially since we already have decodeByteArray). Remove CheckForAssetStream, which is now always special cased in Java. core/jni/android/graphics/Movie.cpp: Call CreateJavaInputStreamAdaptor and use an SkFrontBufferedStream. Add a native function for decoding an Asset, and remove old call to CheckForAssetStream. graphics/java/android/graphics/BitmapFactory.java: Write a helper function for decoding a stream to consolidate common code. Buffer enough of the input so that SkImageDecoder::Factory can rewind after having read enough to determine the type. Unlike the old code, do NOT mark the caller's stream. This is handled in native code. The caller's mark (if any) is left alone. graphics/java/android/graphics/Movie.java: Check for an Asset stream before passing to native, and call a native function for handling the asset directly. BUG:6493544 BUG:8432093 BUG:10725383 Change-Id: Ide74d3606ff4bb2a8c6cdbf11bae3f96696f331a
* Merge "Surface: Change OutOfResourcesException to be a runtime exception" ↵Igor Murashkin2013-09-111-5/+16
|\ | | | | | | into klp-dev
| * Surface: Change OutOfResourcesException to be a runtime exceptionIgor Murashkin2013-09-091-5/+16
| | | | | | | | | | | | | | | | | | - Deprecates SurfaceTexture.OutOfResourcesException, it wasn't used - Make all JNI code throw only Surface.OutOfResourcesException - Get rid of redundant SurfaceControl.OutOfResourcesException Bug: 10566539 Change-Id: I58126260771b9ccff6a69c672ce7719b9f98138d
* | Merge "Remove FD optimization case for decodeStream" into klp-devJohn Reck2013-09-101-15/+1
|\ \
| * | Remove FD optimization case for decodeStreamJohn Reck2013-09-091-15/+1
| |/ | | | | | | | | | | | | | | | | | | Bug: 10677727 The problem is that the FileInputStream may be wrapping a pipe or AssetFileDescriptor which fails if handed to decodeFileDescriptor. The problem is that AFDs can start in the middle of a file, whereas decodeFileDescriptor assumes it can mmap() the FD and start at the beginning. Change-Id: I98a3c5f789865145e25a99b32d205e290808c1cf
* | Merge "Don't set Allocation mSize when we have no Type." into klp-devStephen Hines2013-09-101-1/+4
|\ \ | |/ |/|
| * Don't set Allocation mSize when we have no Type.Stephen Hines2013-09-091-1/+4
| | | | | | | | | | | | | | | | | | | | | | Bug: 10667740 A3D creates Allocations before knowing the underlying Type (and thus size). Moving the mSize calculation to be conditional for concrete Allocations eliminates the bug. In the future, we could let A3D dynamically update the Allocation size if it is necessary to improve heap behavior. Change-Id: I520246806b6ead0387a1a41372dade1a6e7c2271
* | Merge "Add flags word to initialization." into klp-devTim Murray2013-09-091-1/+1
|\ \
| * | Add flags word to initialization.Tim Murray2013-09-091-1/+1
| | | | | | | | | | | | | | | | | | bug 10427951 Change-Id: I1356b9b96315ead44aa3898de5604d75f9bb8be5
generated by cgit v1.1 at 2025-01-09 05:53:35 +0000