summaryrefslogtreecommitdiffstats
path: root/graphics
Commit message (Collapse)AuthorAgeFilesLines
* Add WEBP to the list of Image formats that support Compression.Vikas Arora2011-06-231-1/+2
| | | | | | | | | | Note: The integrator of this change to Android internal code-repo will have to run one extra step 'make update-api' to update 'api/current.txt' file corresponding to approved API. The AOSP branch didn't have this file, hence I could not add the same to this change. The updated file 'api/current.txt' has to be submitted along with this change. Change-Id: I29909e907a2e82d801e16654322190a808c5bda9
* Merge "Fix memory leak of SkMovie class"Conley Owens2011-04-291-0/+11
|\
| * Fix memory leak of SkMovie classKimiyoshi Kusaka2011-03-281-0/+11
| | | | | | | | | | | | | | | | Movie class doesn't have finalize method. So memory leak of SkMovie class of native Skia occurs when Movie class is released. I add finalize method to Movie class (Movie.java) and jni destructor method to SkMovie class (Movie.cpp). Change-Id: I4dae9dd95f128cbfade50bef978b219ba99321dd
* | Eliminating dead logic - bitmap state simply cannot be null here.Jozef BABJAK2011-04-191-3/+1
|/ | | | Change-Id: I33fdf650b06242efa22ca30b3f7252f6854b42f6
* Merge "Fixing the wrong link in YuvImage JavaDoc."Brad Fitzpatrick2011-03-231-3/+3
|\
| * Fixing the wrong link in YuvImage JavaDoc.Keiji Ariyama2011-02-051-3/+3
| | | | | | | | Change-Id: Ie6334e16424e59b75274ef265f10d26ba484316a
* | am 7d234fab: Merge "Don\'t drop the drawable cache completely on ↵Dianne Hackborn2011-01-1412-12/+12
|\ \ | |/ | | | | | | | | | | configuration change" * commit '7d234fabe61cd5f034fe4ff4484209fbf5130c4d': Don't drop the drawable cache completely on configuration change
| * Don't drop the drawable cache completely on configuration changeChristopher Lais2011-01-1412-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a lot of fancy code just above the clear to ensure that drawables that aren't affected by the change are kept, then the entire array was cleared. This patch removes the clear, so that the drawables that haven't changed are really kept, matching the logs, comments and larger part of the code. This patch also fixes the various constant states to return correct ChangingConfigurations. Change-Id: Ic11f6179537318d3de16dc58286989eb62a07f15 Old-Change-Id: I22495e6ed232dfe056207ce5155405af1fa82428
* | am 61d9ffbf: Merge "Do not merge." into gingerbreadWei-Ta Chen2011-01-132-0/+273
|\ \ | | | | | | | | | | | | * commit '61d9ffbfd86dfe6bacce431b8ed9eebe1cfd8178': Do not merge.
| * | Do not merge.Wei-Ta Chen2011-01-112-0/+273
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport changes related to BitmapRegionDecoder from HoneyComb to Gingerbread. Bug: 3309014 //////////////////////////////////////////////////// This is a combination of 7 commits. Revert "Do not merge." This reverts commit f7681f84918c27f6a626681ce37ed2a236c44e82. Change-Id: I46fd710600b1649773eaea2d9abc2b21a592f9a6 Fix a initialization bug in BitmapRegionDecoder. Change-Id: I6c1151fd34970a84d4de52d664d9a5dc464892c5 Fix segfault when tring to throw IOException. Change-Id: I530cc4409ba4ca17cec933afad077c5f60ba554f Fix 3122139, where previewing an attachment for the second time will fail. Use AutoFDSeek to mark and restore the position before we read data from the descriptor. Change-Id: I3d4f012dce486e19b113bc90a98b94031cfa8195 Add inPreferQualityOverSpeed into BitmapFactory.Options. The new field allows a developer to use a more accurate by slightly slower IDCT method in JPEG decode. This in turns improves the quality of the reconstructed image. The field by default is not set and thus does not affect existing applications. Bug: 3238925 Change-Id: I93d55b7226e47a43e639325cd1a677694d6f2ee4 Unhide inPreferQualityOverSpeed in BitmapFactory.Options. The new field allows a developer to use a more accurate by slightly slower IDCT method in JPEG decode. This in turns improves the quality of the reconstructed image. The field by default is not set and thus does not affect existing applications. Bug: 3238925 Related changes: https://android-git.corp.google.com/g/#change,83291 and https://android-git.corp.google.com/g/#change,83294 Change-Id: I969f5c413f9b2179454aeb90e18ae8222ee583b4 Correct the API comments. BitmapRegionDecoder supports PNG as well.
* | | am 69ea4e15: Documentation fixes found over vacation hacking.Brad Fitzpatrick2011-01-051-1/+1
|\ \ \ | |/ / | | / | |/ |/| * commit '69ea4e15e52c456537575d21443ac1efdb03a902': Documentation fixes found over vacation hacking.
| * Documentation fixes found over vacation hacking.Brad Fitzpatrick2011-01-051-1/+1
| | | | | | | | Change-Id: I28900026465d66d950cf4f05f0c202b46c3c2d43
* | am eb6e22f2: Merge "Document Bitmap.createScaledBitmap" into gingerbreadBrad Fitzpatrick2010-10-041-0/+9
|\ \ | |/ | | | | | | | | | | Merge commit 'eb6e22f29ded58e7e51702c34878fd01e20ff802' into gingerbread-plus-aosp * commit 'eb6e22f29ded58e7e51702c34878fd01e20ff802': Document Bitmap.createScaledBitmap
| * Document Bitmap.createScaledBitmapBrad Fitzpatrick2010-10-041-0/+9
| | | | | | | | Change-Id: Ife6a42bc08d17c56274e78a1f5d2c100c2fe4dc8
* | am 83d52229: Doc fix: duplicate word \'of\'Brad Fitzpatrick2010-10-031-1/+1
|\ \ | |/ | | | | | | | | | | Merge commit '83d522290e56f614d0d9373d47c2b54b9e207795' into gingerbread-plus-aosp * commit '83d522290e56f614d0d9373d47c2b54b9e207795': Doc fix: duplicate word 'of'
| * Doc fix: duplicate word 'of'Brad Fitzpatrick2010-10-031-1/+1
| | | | | | | | Change-Id: I45a4ca443becc2f2cf02cbca2bd61ef2ee590b5c
* | am f7681f84: Do not merge.Wei-Ta Chen2010-10-011-263/+0
|\ \ | |/ | | | | | | | | | | Merge commit 'f7681f84918c27f6a626681ce37ed2a236c44e82' into gingerbread-plus-aosp * commit 'f7681f84918c27f6a626681ce37ed2a236c44e82': Do not merge.
| * Do not merge.Wei-Ta Chen2010-10-011-263/+0
| | | | | | | | | | | | | | Fix 3052285 by not publishing the BitmapRegionDecoder API until the honeycomb release. Bug: 3052285 Change-Id: Ie339e414c1a5581e1d38684621e0e97162616977
| * Prevent unhandled exception in NinePatchDrawableSonia Serafimova2010-09-261-8/+10
| | | | | | | | | | | | | | | | | | | | Added null check in computeBitmapSize() to avoid unhandled exception "java.lang.NullPointerException" at android.graphics.Rect.<init>(Rect.java:72). This problem was discovered in the wild. Change-Id: I9d40629a052f1390e1811288af6209d8cc3f679b
* | am 7d9c73fb: Merge "Prevent unhandled exception in NinePatchDrawable"Jean-Baptiste Queru2010-09-261-8/+10
|\ \ | | | | | | | | | | | | | | | | | | Merge commit '7d9c73fb6f6f79f7f92b77482a0edbd7b89f2564' into gingerbread-plus-aosp * commit '7d9c73fb6f6f79f7f92b77482a0edbd7b89f2564': Prevent unhandled exception in NinePatchDrawable
| * | Prevent unhandled exception in NinePatchDrawableSonia Serafimova2010-09-151-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added null check in computeBitmapSize() to avoid unhandled exception "java.lang.NullPointerException" at android.graphics.Rect.<init>(Rect.java:72). This problem was discovered in the wild. Change-Id: I8a4729ceadcfc9744f11b8ceafdf24d6de88c645
* | | am 6b849e21: Unhide BitmapRegionDecoder.Wei-Ta Chen2010-09-222-136/+263
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Merge commit '6b849e2123be98eb2a1a25b8abf0b13a279ce952' into gingerbread-plus-aosp * commit '6b849e2123be98eb2a1a25b8abf0b13a279ce952': Unhide BitmapRegionDecoder.
| * | Unhide BitmapRegionDecoder.Wei-Ta Chen2010-09-232-136/+263
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Rename LargeBitmap to BitmapRegionDecoder 2. Move the instantiations of BitmapRegionDecoder out of BitmapFactory. 3. Remove the use of MemoryFile in BitmapRegionDecoder, since MemoryFile's API had been modified in master. Otherwise, the change will break the master build. 4. Move AssetStreamAdaptor, AutoFDSeek and nullObjectReturn to Utils.h because BitmapFactory.cpp and BitmapRegionDecoder.cpp both need to use these utility functions. Most of the modifications, except for (2) and (3), were reviewed in https://android-git.corp.google.com/g/#change,64716 . However, that change broke the master build due to (3) and was reverted eventually. So, instead of withdrawing this change and waiting for that change to be checked in again, I merge the two changes into one. Change-Id: I2202c0fbbbd6d6676bbd9637e690023ea4099c40
* | | am 219eb7ec: Merge "Fix bug in JNI BitmapFactory" into gingerbreadJoseph Wen2010-09-101-6/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '219eb7ec8403ef9b98125f2b58cc27669ae69712' into gingerbread-plus-aosp * commit '219eb7ec8403ef9b98125f2b58cc27669ae69712': Fix bug in JNI BitmapFactory
| * | Fix bug in JNI BitmapFactoryJoseph Wen2010-09-101-6/+0
| | | | | | | | | | | | | | | | | | | | | In nativeCreateLargeBitmapFromFileDescriptor() if the file descriptor can not be rewinded isShareable should be set to false. Change-Id: I7dd545c9d52d21c226e11b8921e35a1d9bba9515
* | | am 1b214be9: Merge "Revert "Rename LargeBitmap to BitmapRegionDecoder for ↵Wei-Ta Chen2010-09-071-270/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | having a better API."" into gingerbread Merge commit '1b214be92ac206d8ac6ef4967db6e2859d91ab49' into gingerbread-plus-aosp * commit '1b214be92ac206d8ac6ef4967db6e2859d91ab49': Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."
| * | Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."Wei-Ta Chen2010-09-081-270/+0
| | | | | | | | | | | | This reverts commit 50ba3d2c09a9131f3578d271adf2bc8258ca1742.
* | | am b356f8ac: Merge "Rename LargeBitmap to BitmapRegionDecoder for having a ↵Wei-Ta Chen2010-09-071-0/+270
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | better API." into gingerbread Merge commit 'b356f8acec9fdfd36f01e5cca4fe3a28ecd6e628' into gingerbread-plus-aosp * commit 'b356f8acec9fdfd36f01e5cca4fe3a28ecd6e628': Rename LargeBitmap to BitmapRegionDecoder for having a better API.
| * | Rename LargeBitmap to BitmapRegionDecoder for having a better API.Wei-Ta Chen2010-09-071-0/+270
| | | | | | | | | | | | | | | | | | | | | Move AssetStreamAdaptor, AutoFDSeek and nullObjectReturn to Utils.h because BitmapFactory.cpp and BitmapRegionDecoder.cpp both need to use these utility functions. Change-Id: I3e60c7fe4abd0289e1384e69a08fd20fe6fb0e10
* | | am 72ecb00a: Merge "Revert "Don\'t recycle native bitmap after the finalizer ↵Chih-Chung Chang2010-08-221-1/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | is called."" into gingerbread Merge commit '72ecb00a89b7a49eadb9c3bb880102eef97c8eb6' into gingerbread-plus-aosp * commit '72ecb00a89b7a49eadb9c3bb880102eef97c8eb6': Revert "Don't recycle native bitmap after the finalizer is called."
| * | Revert "Don't recycle native bitmap after the finalizer is called."Chih-Chung Chang2010-08-221-1/+0
| | | | | | | | | | | | | | | | | | Bitmap should not be accessed from multiple threads. This reverts commit 966803ab81f8e9bfefa502fcb533de023825a389.
* | | am d6f7f225: Merge "Load bitmaps in the correct format." into gingerbreadRomain Guy2010-08-201-0/+11
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'd6f7f225689ecd33dc54699acc01cfafc781c20d' into gingerbread-plus-aosp * commit 'd6f7f225689ecd33dc54699acc01cfafc781c20d': Load bitmaps in the correct format.
| * | Load bitmaps in the correct format.Romain Guy2010-08-201-0/+11
| | | | | | | | | | | | | | | | | | Bug #2936873 Change-Id: Ide93ffd8227cea6c610dde625163ccffb4590e90
* | | am dc2eabd1: Merge "Don\'t recycle native bitmap after the finalizer is ↵Chih-Chung Chang2010-08-201-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | called." into gingerbread Merge commit 'dc2eabd10847d8e7f016fec5232d40b723ce2828' into gingerbread-plus-aosp * commit 'dc2eabd10847d8e7f016fec5232d40b723ce2828': Don't recycle native bitmap after the finalizer is called.
| * | Don't recycle native bitmap after the finalizer is called.Chih-Chung Chang2010-08-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | If an object A's finalizer calls Bitmap B's recycle() when B's finalizer is already called, we will have trouble because the native bitmap is already freed in the finalizer. Change-Id: Ic0be8ed75fb3aacee9ce6e3d9908178a55151eb9
* | | am d018a0ce: Merge "Text selection without trackball." into gingerbreadGilles Debunne2010-08-191-2/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'd018a0ce72124f668d859b19fe3e73f5637d3c7c' into gingerbread-plus-aosp * commit 'd018a0ce72124f668d859b19fe3e73f5637d3c7c': Text selection without trackball.
| * | Merge "Text selection without trackball." into gingerbreadGilles Debunne2010-08-191-2/+4
| |\ \
| | * | Text selection without trackball.Gilles Debunne2010-08-191-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backported from HC. Squashed commit of the following: commit af214a595c7a9fdd11a2dc384f7d4665abf751c0 Fixes in TextView's selection. commit eb9fd59ebe6500a66c2003d46b5802299970ae8d TextView with Selection Contextual Mode commit 4c4c338ef355b369ce4b57d6c6fba7ee8f9dddf4 Cosmetic changes around TextView. commit d4b4b054e87480d984ad18766f5e76553e3080d8 Double and one and a half tap removed from TextView. commit 897c2847ba1fca8ef01eadadd1bc3de007af3ee5 Selection handlers in TextView commit 832be74a5394649e28927484d9a86c6d53b430e7 New cursor controller in TextViews. Change-Id: I01cc64736e2abea605317ee53907a1713617fc17
* | | | am 288471d8: DO NOT MERGE. Load assets in place instead of deferring until draw.Romain Guy2010-08-191-13/+11
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '288471d8a57e1c318742cbfc28697877436fdb87' into gingerbread-plus-aosp * commit '288471d8a57e1c318742cbfc28697877436fdb87': DO NOT MERGE. Load assets in place instead of deferring until draw.
| * | | DO NOT MERGE. Load assets in place instead of deferring until draw.Romain Guy2010-08-191-13/+11
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Before this change, all framework assets would be decoded at drawing time outside of zygote. This was forcing all apps to re-decode the assets and zygote to keep an in-memory copy of each asset. This behavior is now opt-in by setting the inPurgeable flag on BitmapFactory.Options. Change-Id: Ief823139163d8071b8ee1267746622faf52eb8ec
* | | am f1f48bc7: Do JPEG tile-based decoding.Joseph Wen2010-08-172-0/+271
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'f1f48bc7f200f54c76b22d845d8ba8419879b375' into gingerbread-plus-aosp * commit 'f1f48bc7f200f54c76b22d845d8ba8419879b375': Do JPEG tile-based decoding.
| * | Do JPEG tile-based decoding.Joseph Wen2010-08-172-0/+271
| | | | | | | | | | | | Change-Id: I5c1b4ac3c02eb4350ef0ba9a7877b22cfd730cfb
* | | am 5352d237: am 38137d7a: Merge "docs: lots of additions to the resources ↵Scott Main2010-07-1513-18/+46
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo Merge commit '5352d2378d2f92ebe0657e4caedb4498492fc404' into gingerbread-plus-aosp * commit '5352d2378d2f92ebe0657e4caedb4498492fc404': docs: lots of additions to the resources docs
| * | am 38137d7a: Merge "docs: lots of additions to the resources docs new ↵Scott Main2010-07-1513-18/+46
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo Merge commit '38137d7a27b037611c70a9d900aa53b4c15563bf' into gingerbread * commit '38137d7a27b037611c70a9d900aa53b4c15563bf': docs: lots of additions to the resources docs
| | * | docs: lots of additions to the resources docsScott Main2010-06-2113-18/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type Change-Id: I733eec50bb2671f28c9e6dd7dec14eb6586f5193
* | | | am 38eea8bf: Merge "Remove the YV16 format for simplicity\'s sake." into ↵Mathias Agopian2010-07-141-49/+72
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '38eea8bf990540360b45b963195a7766c30b55d2' into gingerbread-plus-aosp * commit '38eea8bf990540360b45b963195a7766c30b55d2': Remove the YV16 format for simplicity's sake.
| * | | Remove the YV16 format for simplicity's sake.Mathias Agopian2010-07-141-49/+72
| | | | | | | | | | | | | | | | Change-Id: Iee03d100933ba0c67b13d51e0435be3b4cd953cf
* | | | merge from froyo-plus-aospThe Android Open Source Project2010-06-071-1/+1
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| Change-Id: I58f1d905b3fa781e4f5827d4d7b9323a4cdcc04e
| * | merge from open-source masterThe Android Open Source Project2010-06-071-1/+1
| |\ \ | | | | | | | | | | | | Change-Id: I1a36964a723bce72139f1bc2402520b7f8d5e47b
| | * | Canvas.drawVertices: correct color range-checkErik Faye-Lund2010-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The range-check in drawVertices previously checked that the color count was equal to the vertex count. However, the vertex count is specified in array elements, and there's two array elements per vertex for the positions, but only one array element per vertex for the colors. Correct the code so the check is consistent with the element count. Change-Id: Id043f1003f9245f18adc91bac49dc33727ca765e
generated by cgit v1.1 at 2024-12-24 20:29:09 +0000