summaryrefslogtreecommitdiffstats
path: root/tools/layoutlib/bridge/src/android/graphics
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Update layoutlib tests to check methods return value.Deepanshu Gupta2014-02-214-18/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test in layoutlib bridge has been updated to check the return value of the delegate method match the value of the overriden method. This changeset also fixes the problems found due to this change. Change-Id: I87cef323c4eaee4e9f60475f01156b276593fa50
* | | | Set default text style in layoutlib as NORMALDeepanshu Gupta2014-02-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a style doesn't specify text style (normal/bold/italic/bold-italic) then default to normal instead of throwing an error. Bug: http://b.android.com/61358 Change-Id: I0138c73807a5ff6e4d938a99ece3044333110aa1
* | | | Fix native methodsDeepanshu Gupta2014-02-185-34/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix native method signatures as changed by the following commits: 56f57ccbd4fbbf4d572cc966d1cb76d7ae7ad334 76d3a1b8d035d27bc80b0f2fc480a903bd001514 Change-Id: I5db31d3665a5e8c84c107cf84ec3bd5ccfb9a9fe
* | | | am f7193bf8: am d9f9da39: am 56b86deb: am 1c91b1f7: am 45dbfcc7: Improve ↵Deepanshu Gupta2014-02-101-40/+45
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | text rendering and measurement. * commit 'f7193bf89780039cf924dd7d1bb67f4830517231': Improve text rendering and measurement.
| * \ \ \ am d9f9da39: am 56b86deb: am 1c91b1f7: am 45dbfcc7: Improve text rendering ↵Deepanshu Gupta2014-02-101-40/+45
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | and measurement. * commit 'd9f9da396b41f394991f676bc74dcfc59c7070a8': Improve text rendering and measurement.
| | * | | am 1c91b1f7: am 45dbfcc7: Improve text rendering and measurement.Deepanshu Gupta2014-02-101-40/+45
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '1c91b1f7a2da5e5b1996217228399ef958c2be0c': Improve text rendering and measurement.
| | | * | Improve text rendering and measurement.Deepanshu Gupta2014-02-061-40/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Fix a bug where baseline of the run was modified while rendering resulting in crooked text in some cases. 2. Use GlyphVector.getLogicalBounds() for text measurement which is more accurate than getVisualBounds(). 3. This change also optimizes text rendering by not computing the advances for individual glyphs when not needed. Change-Id: I66792c4d8f50eaf29afa70bccca1e6c812a3fa28
* | | | | am 1bcc286d: am db0427a0: am 5800b19a: am 50b0ce4e: am fd8cba3a: Merge "Fix ↵Deepanshu Gupta2014-02-063-41/+60
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | the measurement of text bounds." into klp-dev * commit '1bcc286def646f98747bce2c4dedb0737d5fcf9d': Fix the measurement of text bounds.
| * | | | am db0427a0: am 5800b19a: am 50b0ce4e: am fd8cba3a: Merge "Fix the ↵Deepanshu Gupta2014-02-063-41/+60
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | measurement of text bounds." into klp-dev * commit 'db0427a0ac986e0823e7bbe9b7c12a97aabe133e': Fix the measurement of text bounds.
| | * | | am 50b0ce4e: am fd8cba3a: Merge "Fix the measurement of text bounds." into ↵Deepanshu Gupta2014-02-063-41/+60
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev * commit '50b0ce4e8ed353ed841782aeb58963bc084f2e16': Fix the measurement of text bounds.
| | | * | Merge "Fix the measurement of text bounds." into klp-devDeepanshu Gupta2014-02-063-41/+60
| | | |\ \
| | | | * | Fix the measurement of text bounds.Deepanshu Gupta2014-01-073-41/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12366230 Change-Id: I203b678363dc7b688c744503ee10216baca658a9
* | | | | | am 1bceb982: am 650d30c5: am b156c019: am d5129e75: am 8a892279: Fix a bug ↵Deepanshu Gupta2014-02-061-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in Nine Patch library. * commit '1bceb9823f7af258489c91fa201214805744fa4a': Fix a bug in Nine Patch library.
| * | | | | am 650d30c5: am b156c019: am d5129e75: am 8a892279: Fix a bug in Nine Patch ↵Deepanshu Gupta2014-02-061-2/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | library. * commit '650d30c5ec3c0b345651a56c45eb334fabf51b17': Fix a bug in Nine Patch library.
| | * | | | am d5129e75: am 8a892279: Fix a bug in Nine Patch library.Deepanshu Gupta2014-02-061-2/+2
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit 'd5129e75968030620a1372e39fcfbc17fe584e17': Fix a bug in Nine Patch library.
| | | * | | Fix a bug in Nine Patch library.Deepanshu Gupta2014-02-051-2/+2
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The nine patches were not drawn correctly if they were not positioned at the top left corner of the canvas. Bug: http://b.android.com/29959 Change-Id: Icfed522ea07322a3ee9f3955067d3da26c4b0b5b
* | | | | am 98ac6c79: resolved conflicts for merge of cb7cdd50 to ↵Narayan Kamath2014-01-311-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev-plus-aosp * commit '98ac6c79a430e62a886b3a8278694425b5906300': Fix a few more delegate methods in layoutlib.
| * | | | resolved conflicts for merge of cb7cdd50 to klp-modular-dev-plus-aospNarayan Kamath2014-01-313-3/+3
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| Change-Id: I2fc48fb4bd779042fc9bc00e6c8aca876d4a5f0b
| | * | Fix a few more delegate methods in layoutlib.Narayan Kamath2014-01-293-4/+4
| | | | | | | | | | | | | | | | Change-Id: Icd7069452b9ac66498af69ec705d12c3acd1c848
| * | | resolved conflicts for merge of b82b2f98 to klp-dev-plus-aospNarayan Kamath2014-01-2836-315/+314
| |\ \ \ | | |/ / | | | / | | |/ | |/| Change-Id: Ia110056e5fdd2387c207748b17c5c17d1a18ac5b
| | * Track 64bit changes to android/graphics.Narayan Kamath2014-01-2836-315/+314
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All pointers are now 64bits wide, so should be represented as java longs and not ints. Also changed DelegateManager and SparseWeakArray to reflect the new world order. (cherry picked from commit 88a8364c386c694f7ad56662ef89713dbf7c9d63) Change-Id: Ic2f55dd6235751169c5014f9d2ccf3f544259a87
| * | Update delegate methods in layoutlib.Deepanshu Gupta2013-11-254-89/+21
| |/ | | | | | | Change-Id: I1f0fc274b6a74dbcf0ed46175c4a2fa4c2dd9a63
| * Update changed delegate method in Bitmap_Delegate. DO NOT MERGEDeepanshu Gupta2013-11-131-1/+2
| | | | | | | | | | Issue: https://code.google.com/p/android/issues/detail?id=60167 Change-Id: I3e1d6b9d52ca899889ba758b0ea91bd742cf5005
| * Fix layoutlib for KKDeepanshu Gupta2013-10-161-7/+28
| | | | | | | | | | | | | | | | Fix a NPE, update the native methods for NinePatch and update an ICU method to return the right value as required by DatePicker widget. Bug: 11140701 Change-Id: Id92fc5359acf6dde1bcdbc781aaf637fdb6eecbf
| * Merge "Add isPremultiplied option to Bitmap_Delegate in LayoutLib" into klp-devDeepanshu Gupta2013-09-092-14/+88
| |\
| | * Add isPremultiplied option to Bitmap_Delegate in LayoutLibDeepanshu Gupta2013-09-042-14/+88
| | | | | | | | | | | | Change-Id: Id06921d8db2fe898fdc60ef9d05d05f8dfe3f94a
| * | am b50de495: am dd4efc22: am 3a762d8b: Merge "Fix text rendering" into ↵Deepanshu Gupta2013-09-053-187/+253
| |\ \ | | |/ | |/| | | | | | | | | | | | | jb-mr2-dev * commit 'b50de4951aaea6d6f01432dc17b7c5de778a2e71': Fix text rendering
| | * Fix text renderingDeepanshu Gupta2013-09-053-187/+253
| | | | | | | | | | | | | | | | | | | | | | | | | | | There are still some errors 1. Little vertical clippping for extra tall glyphs. 2. Breaking into scripts isn't perfect which results in incorrect layout of text. Change-Id: I54de3c05eca5e8affb1135c120eea24c3afe8a47
* | | Fix buildDeepanshu Gupta2014-01-291-1/+1
| | | | | | | | | | | | Change-Id: Ifcbf44bc310daee4410ccc6ddf6bdc44565e20da
* | | Fix native method signaturesDeepanshu Gupta2014-01-295-15/+38
| | | | | | | | | | | | | | | | | | Some new methods have been added which are yet to be implemented. Change-Id: Ie5a0657c7ccbe95200c270d5c15b516a385b083b
* | | Manual merge of changes from klp-devDeepanshu Gupta2014-01-294-95/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manually merged the following changes from klp-dev branch and fixed merge conflicts: 78cfdf31b7c48589ea3a148ec1d6d573235bc06b d0581d271e814670d81a6550aa7b1e86864d5710 1f92d7fc0ffa72d7db93244c29a1a6575bb4b318 0baec410c29206dc72d9f5afba5d45827e62c00c 24541255c312ee34f9bf17eb5852cdffd4807065 Change-Id: I426729bb90a26746bfff3a0e4a03ea9f37972528
* | | Track 64bit changes to android/graphics.Narayan Kamath2014-01-2836-315/+314
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All pointers are now 64bits wide, so should be represented as java longs and not ints. Also changed DelegateManager and SparseWeakArray to reflect the new world order. Change-Id: Ic32b6b53818dbae9b949f03004c4fb6dae26cdbe
* | | Manual merge of changes from frameworks/base/toolsDeepanshu Gupta2014-01-271-7/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manually merge of following changes: 9cb5f5b5233f2331748d108d71f4b685762f32a7 1cf5df38f4bdafa1beb2674ca548ad6d9650766b 083e3caf66c21f7cc9511db479726c38d90e2d2f 81f74f4bc96ea4266cebe1b785d095558f540800 39e75835399f4d979cf82069dae2bd1ec496fb81 272d1bce798a5fef42cc2ee31f629d00c89f66eb 45f5cd49fa898a59484edfd8e291dbe10df82db2 Change-Id: Ie21ca480ac117e16e28eb554474835b762ccb104
* | | Add isPremultiplied option to Bitmap_Delegate in LayoutLibDeepanshu Gupta2014-01-272-15/+86
| | | | | | | | | | | | Change-Id: I2398af48913682ec698389b695aa256204c8aa47
* | | Fix text renderingDeepanshu Gupta2014-01-273-187/+253
| | | | | | | | | | | | | | | | | | | | | | | | | | | There are still some errors 1. Little vertical clippping for extra tall glyphs. 2. Breaking into scripts isn't perfect which results in incorrect layout of text. Change-Id: Ib7b008b4ab5e689038678825289199aeb4bd815b
* | | Revert "Move frameworks/base/tools/ to frameworks/tools/"Adam Lesinski2014-01-2739-0/+9242
| | | | | | | | | | | | This reverts commit 9f6a119c8aa276432ece4fe2118bd8a3c9b1067e.
* | | Move frameworks/base/tools/ to frameworks/tools/Mike Lockwood2013-08-2839-9242/+0
|/ / | | | | | | Change-Id: I3ffafdab27cc4aca256c3a5806b630795b75d5c8
* | Add inPremutiplied option to BitmapFactory.Options, functionality in BitmapChris Craik2013-08-201-2/+4
| | | | | | | | | | | | bug:2248948 Change-Id: I8fdd649332667598504a1076d5a447572bd53086
* | Refactor Canvas.drawPicture() to delegate to PictureJonathan Dixon2013-08-081-8/+0
|/ | | | | | | | | Bug: 9814370 To allow WebView.capturePicture() to return a subclass, we need to ensure the subclass is always consulted when being drawn into a canvas. Change-Id: Ia0357f95b6fafb3ac81e6bcfaef05739e619897a
* Add missing native methods.Deepanshu Gupta2013-05-233-35/+63
| | | | Change-Id: I7b34e2ec0164520efc658053a80f307791a992b1
* Update framework to support r5967 of Skia.Derek Sollenberger2012-12-121-5/+0
| | | | | bug: 6906025 Change-Id: Iefdb830ec3aa2ab3472c1c142484a7aa21788a15
* Add missing native method to Canvas_Delegate.Xavier Ducrohet2012-05-081-0/+5
| | | | Change-Id: I86288c942004e5489eacc43ba5e112cf56f94487
* Fix Paint_Delegate with missing native method.Xavier Ducrohet2012-04-231-1/+20
| | | | Change-Id: I39638dcb323fdd1ec3cb58dcad05757145d09026
* Embed layout padding in nine patch imagesAmith Yamasani2012-04-041-1/+2
| | | | | | | | | | | | | - Added a new custom PNG chunk that carries the layout padding ints. - Extract the padding ticks from .9.png images and store in the chunk. - Load the padding information at runtime into Bitmap and NinePatchDrawable. - The new chunk is ordered first so that it doesn't cause a problem in older versions of the platform. Bug: 6087201 Change-Id: I5de46167a1d44b3ec21065b0c165e594b1dc8399
* Add Delegate for ViewRootImpl#isInTouchMode to prevent IPC call in Eclipse.Xavier Ducrohet2012-03-231-4/+14
| | | | | | Also fix some new/removed method from BitmapFactory. Change-Id: I606bd8bee6ff1e2c6c9472b4672175bfdaff45de
* Setup ActionBars in layoutlib the same way the platform does it.Xavier Ducrohet2012-02-061-2/+2
| | | | | | | | | | | Instead of using a simple ImageView for the icon, this uses the platform layout/action_bar_home which uses a custom class to position and resize the icon (and also supports the Up icon that we don't yet support). This ensures that the icon is properly positionned and sized like on devices. Change-Id: I57432afa82d257bb043247001320b368045d7f55
* Make Layoutlib compile on Java 6.Xavier Ducrohet2012-02-027-0/+31
| | | | Change-Id: Ic8f0e321c6c218de83664fc01f253a07fa80852c
* Merge "Remove unused code"Romain Guy2012-01-191-11/+0
|\
| * Remove unused codeRomain Guy2012-01-191-11/+0
| | | | | | | | Change-Id: Ife0a43f3cfe64a1e74401b10bf74d37cbeefb5af
* | Fix broken drawCircle LayoutLib.Xavier Ducrohet2012-01-181-1/+1
|/ | | | Change-Id: I5e23bbe0119e385fa2f77854a8f88128351d3759