summaryrefslogtreecommitdiffstats
path: root/graphics/java
Commit message (Collapse)AuthorAgeFilesLines
* 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 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
| * | Improved error handling when font loading fails.Peter Eliasson2010-04-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this patch, an application could trigger a platform crash by calling: Typeface typeface = Typeface.createFromFile(""); boolean isbold = typeface.isBold(); The crash occurs since the Skia error that occurs when font loading fails is not propagated. With this patch, the Typeface constructor throws an IllegalStateException when Skia fails to load the font (i.e. when the native instance is null). Change-Id: I1002b37b7b32840cb7eeef6819d2982cb18c9003
| * | merge from open-source masterThe Android Open Source Project2010-03-302-3/+4
| |\ \ | | | | | | | | | | | | Change-Id: Iad50c5ab4915d0868b3f79ea6ba0d657a6f98525
| * \ \ am 0b9bbb6d: DO NOT MERGE. Merge Froyo renderscript to Eclair to support ↵Jason Sams2010-02-1210-496/+591
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | live wallpapers on droid. This gives the necessary CPU reduction to allow the wallpapers to work on the slower CPU. Merge commit '0b9bbb6dc5d7dabecf23e8c6bb4a267ba8c34fe8' into eclair-plus-aosp * commit '0b9bbb6dc5d7dabecf23e8c6bb4a267ba8c34fe8': DO NOT MERGE. Merge Froyo renderscript to Eclair to support live wallpapers on droid. This gives the necessary CPU reduction to allow the wallpapers to work on the slower CPU.
| | * | | DO NOT MERGE. Merge Froyo renderscript to Eclair to support live wallpapers ↵Jason Sams2010-02-1110-496/+591
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on droid. This gives the necessary CPU reduction to allow the wallpapers to work on the slower CPU. Committer: Jason Sams <rjsams@android.com> On branch droid Changes to be committed: (use "git reset HEAD <file>..." to unstage) modified: libs/rs/rsAllocation.cpp modified: libs/rs/rsAllocation.h modified: libs/rs/rsContext.cpp modified: libs/rs/rsContext.h modified: libs/rs/rsProgram.cpp modified: libs/rs/rsProgram.h Delete the old rollo sample which is obsolete. Fix film init Begin gl2 support. Renderscript still uses GL1.1 by default. However, 2.0 can be enabled and will render most tests correctly. Fix film Beging GL2 user shaders. Switch master to using GL2 by default. Implement RS tracked defered texture and buffer object uploads. Committer: Jason Sams <rjsams@android.com> On branch droid Changes to be committed: (use "git reset HEAD <file>..." to unstage) modified: libs/rs/rsAllocation.cpp modified: libs/rs/rsAllocation.h modified: libs/rs/rsContext.h modified: libs/rs/rsProgramFragment.cpp modified: libs/rs/rsSimpleMesh.cpp Remove check for surface valid that is no longer valid. Continue development of es2.0 user shader support for renderscript. This change cleans up ProgramVertex creation and adds support for passing input, output, and constant type info. Continue es2 shader dev Conflicts: graphics/java/android/renderscript/Program.java graphics/java/android/renderscript/ProgramVertex.java Place shader logging behind prop to declutter logs. Fix emulated glColor in es2 mode. Fix live wallpaper many. Z coordinate was being ignored for draw quad call. Add argument checking to sampler builder to disallow illegal modes. Move texture bindings to base program object. Change ProgramFragment creation to require a texture format in 1.0 mode. Element restructuring. Add support for new basic Element types including the RS objects and vectors(2-4). In theory this paves the way for maintaining type info for RS objects, passing elements for GLSL uiforms/attribs/varyings, and supporting nested structures. This will break some apps, checkings for other projects will follow to unbreak them. Disable excessive RS logging. Add RS support for generic attribs as input to vertex programs. More complete support for named attribs. Adds user typed attribs as available to programVertex. Non user attribs are not treated like user for GL2 for simplicity. Support npot on es 2.0 HW. Change user attribs to look for empty slot rather than using them in order. Prevents conflict with numbered legacy slots. Fix npot but where mipmap level sizes were rounding in the wrong direction. Should always be floor. Implement type generation for user uniforms in vertex shader. Remove excessive logging, fix error in GLSL uniform generation. Fix RS mipmap generation for 8 bit alpha textures. Cleanup seperation of Legacy and user attribs. All user programs now use the new names. Legacy vertex attribs are given default names. Fix some minor bugs with GL state setup that were exposed by Droids driver. Implement drawSpriteCropped on es2.0
* | | | | merge from open-source masterThe Android Open Source Project2010-03-291-1/+2
|\ \ \ \ \ | | |_|/ / | |/| | / | |_|_|/ |/| | | Change-Id: I6a7542e696e69bc8788f3b3b77fcec50512ba81c
| * | | Fix typos in comment.David Hoover2010-03-281-1/+2
| | | | | | | | | | | | | | | | Change-Id: Ia2a9ea0802bcc5773bb4fd52d7e07f9492242bfd
* | | | merge from open-source masterThe Android Open Source Project2010-03-251-2/+2
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I4d8f34986fd9e16ead8a22909263069dbb819d3e
| * | | setCornerRadii should be called when either of corners radius is specifiedviral.vkm2010-03-251-2/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | as 0dp and thus while checking for condition, it should be ORed and not ANDed. It solves Android Issue: 939 http://code.google.com/p/android/issues/detail?id=939 Change-Id: Ic18fae769480972f763f634e7462c6ed3853220b
* | | update dox that we ignore the exact parameter on computeBoundsMike Reed2010-03-251-9/+7
| | | | | | | | | | | | Change-Id: I6051210ea2a73b4d1c6cd631a285209ab130b4e5
* | | Fix the build.Romain Guy2010-03-101-0/+4
| | | | | | | | | | | | Change-Id: I0caef1fd522d231d803e0fd9e0b8fdf3272db168
* | | hidden api sameAs() to compare the pixels of 2 bitmaps for equalityMike Reed2010-03-081-0/+14
| | |
* | | Add support for linking to a skia bitmap rather than always copying the data ↵Jason Sams2010-03-012-1/+46
| | | | | | | | | | | | from the bitmap.
* | | Support defered generation of mipmaps. With this change we support mipmap ↵Jason Sams2010-02-232-2/+7
| | | | | | | | | | | | generation when the texture is uploaded to GL without requiring RS to retain the full chain.
* | | Add ImageFormat.java and move the Camera/YUV constants from PixelFormat to it.Mathias Agopian2010-02-183-26/+105
| | | | | | | | | | | | PixelFormat's corresponding constansts are now deprecated.
* | | Merge "update dox"Mike Reed2010-02-181-7/+7
|\ \ \
| * | | update doxMike Reed2010-02-171-7/+7
| | | |
* | | | Added more @RemotableViewMethod methods, mutate ImageView.Jeff Sharkey2010-02-171-1/+4
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Catch some View methods missed during the first pass of marking with @RemotableViewMethod annotation. Also adds new ImageView.setColorFilter(int) to match the android:tint XML attribute. When ImageView touches ColorFilter or alpha, mutate the underlying Drawable. Fix NPE in StateListDrawable.mutate().
* | | am 1e90ab54: merge from open-source masterThe Android Open Source Project2010-02-111-5/+19
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Merge commit '1e90ab542d675616e9370ab7e5add99d7af12587' * commit '1e90ab542d675616e9370ab7e5add99d7af12587': Fixs the incorrect message for SecurityException Default RotateDrawable's pivot set to (50%, 50%)
| * | merge from open-source masterThe Android Open Source Project2010-02-111-5/+19
| |\ \
| | * | Default RotateDrawable's pivot set to (50%, 50%)Cyril Mottier2010-02-061-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to define the pivot in an XML-instanciated RotateDrawable, android:pivotX and android:pivotY had to be set in your XML. Forgetting to set those attributes ended up in a NullPointerException (tv = null) that were caught by the Resources.getDrawable() method (caught as an Exception). As a result a not-very-accurate message was logged: "Resource not found ...". Defining a default pivot value seems like a great fix. Some other fixes would be to modify the documentation or notify the user with a better explanation than "Resource not found ...".
| | * | merge from eclairJean-Baptiste Queru2009-11-1544-174/+4158
| | |\ \
| | | * | eclair snapshotJean-Baptiste Queru2009-11-1344-175/+4159
| | | | |
| * | | | am a66baccc: Merge "Do not merge" into eclairMike Reed2010-01-201-0/+173
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | Merge commit 'a66baccc8fa9f6fa5f1630845e3c6370cb3418eb' into eclair-plus-aosp * commit 'a66baccc8fa9f6fa5f1630845e3c6370cb3418eb': Do not merge
| | * | | Do not mergeMike Reed2010-01-201-0/+173
| | | | | | | | | | | | | | | | | | | | port stretchy from master
generated by cgit v1.1 at 2024-12-27 15:43:48 +0000