summaryrefslogtreecommitdiffstats
path: root/tools/layoutlib
Commit message (Collapse)AuthorAgeFilesLines
* Update layoutlib tests to check methods return value.Deepanshu Gupta2014-02-216-20/+28
| | | | | | | | | 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
* Merge "Add ability to obtain themed Drawable from Context"Deepanshu Gupta2014-02-201-0/+5
|\
| * Add ability to obtain themed Drawable from ContextDeepanshu Gupta2014-02-181-0/+5
| | | | | | | | | | | | | | This is to fix the rendering in layoutlib broken due to 8eea3ea5591e59f55cbb4f6b2b7e9363a285ced3 Change-Id: I3da6691ad86502bd4fa4b302deb381a840b94655
* | Merge "Set default text style in layoutlib as NORMAL"Deepanshu Gupta2014-02-191-0/+3
|\ \
| * | 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 sans-serif-thin and sans-serif-light fonts in layoutlib.Deepanshu Gupta2014-02-191-3/+5
|/ | | | | | | | For these font families, text was always rendered as italic. This changeset fixes the issue. Bug: http://b.android.com/57221 Change-Id: Ic8a299bd1e555f5bb914cd3d2fe72917ec7f471a
* Fix native methodsDeepanshu Gupta2014-02-185-34/+1
| | | | | | | | Fix native method signatures as changed by the following commits: 56f57ccbd4fbbf4d572cc966d1cb76d7ae7ad334 76d3a1b8d035d27bc80b0f2fc480a903bd001514 Change-Id: I5db31d3665a5e8c84c107cf84ec3bd5ccfb9a9fe
* Fix layoutlib by avoiding Java7 callsDeepanshu Gupta2014-02-173-1/+39
| | | | | | | This change also fixes a NPE in TypedArray caused by changes in the framework. Change-Id: Ie64237c567fa16c35c807db22ce9a4b609ee411d
* 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 7bd287b7: am ea2ec77f: am 3adb34ee: am 9fcfbfe2: am 3bf38b41: Merge "Add ↵Deepanshu Gupta2014-02-062-3/+102
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | methods for Time_Delegate" into klp-dev * commit '7bd287b70a1c95c96663a6028e9809fd3844f55a': Add methods for Time_Delegate
| * | | am ea2ec77f: am 3adb34ee: am 9fcfbfe2: am 3bf38b41: Merge "Add methods for ↵Deepanshu Gupta2014-02-062-3/+102
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Time_Delegate" into klp-dev * commit 'ea2ec77f9538de2ea795d3e257f19e8cff659665': Add methods for Time_Delegate
| | * | am 9fcfbfe2: am 3bf38b41: Merge "Add methods for Time_Delegate" into klp-devDeepanshu Gupta2014-02-062-3/+102
| | |\ \ | | | |/ | | | | | | | | | | | | * commit '9fcfbfe296d7033ee031171f61b3a33044abee42': Add methods for Time_Delegate
| | | * Merge "Add methods for Time_Delegate" into klp-devDeepanshu Gupta2014-02-062-3/+102
| | | |\
| | | | * Add methods for Time_DelegateDeepanshu Gupta2014-01-312-3/+102
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b.android.com/65359 Change-Id: I7c2d09286d6bcd9899444aaa5a4a5a342e39d923
* | | | | am 6a9cbd5a: am a0023027: am 23de8dc2: am 28e049ef: am 0db6e6a5: Merge ↵Deepanshu Gupta2014-02-061-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | "Optimize layout rendering in layoutlib" into klp-dev * commit '6a9cbd5a2d56782e94b870735df51d32314684d8': Optimize layout rendering in layoutlib
| * | | | am a0023027: am 23de8dc2: am 28e049ef: am 0db6e6a5: Merge "Optimize layout ↵Deepanshu Gupta2014-02-061-2/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | rendering in layoutlib" into klp-dev * commit 'a0023027e5b7245e2cef304d96826a7ae1c361aa': Optimize layout rendering in layoutlib
| | * | | am 28e049ef: am 0db6e6a5: Merge "Optimize layout rendering in layoutlib" ↵Deepanshu Gupta2014-02-061-2/+2
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit '28e049ef73f5d9301a198ac53535442b697b7ef4': Optimize layout rendering in layoutlib
| | | * | Merge "Optimize layout rendering in layoutlib" into klp-devDeepanshu Gupta2014-02-061-2/+2
| | | |\ \
| | | | * | Optimize layout rendering in layoutlibDeepanshu Gupta2014-01-201-2/+2
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The height of a layout should be zero if it is assigned a layout_weight. This way, the layout is measured only once and prevents spurious errors. Bug: https://code.google.com/p/android/issues/detail?id=58398 Change-Id: If49a7480e5eb82cb86780e00f2f5b65ee053fc2a
* | | | | am f9021e48: am bd762373: am 096e4359: am f2f108fe: am a955314d: Merge "Add ↵Deepanshu Gupta2014-02-069-31/+143
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | missing files to fix libphonenumber for layoutlib." into klp-dev * commit 'f9021e48bedc9fda9bff4e33244e689fb06e8ecb': Add missing files to fix libphonenumber for layoutlib.
| * | | | am bd762373: am 096e4359: am f2f108fe: am a955314d: Merge "Add missing files ↵Deepanshu Gupta2014-02-069-31/+143
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | to fix libphonenumber for layoutlib." into klp-dev * commit 'bd762373964eb3cb71bdd79cbf82c27faa22699d': Add missing files to fix libphonenumber for layoutlib.
| | * | | am f2f108fe: am a955314d: Merge "Add missing files to fix libphonenumber for ↵Deepanshu Gupta2014-02-069-31/+143
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | layoutlib." into klp-dev * commit 'f2f108fe86337a429a0940f264761dbc27f817fe': Add missing files to fix libphonenumber for layoutlib.
| | | * | Merge "Add missing files to fix libphonenumber for layoutlib." into klp-devDeepanshu Gupta2014-02-069-31/+143
| | | |\ \
| | | | * | Add missing files to fix libphonenumber for layoutlib.Deepanshu Gupta2014-01-179-31/+143
| | | | |/ | | | | | | | | | | | | | | | Change-Id: I8102da6c1c4625e887293a8823770d199521c53f
* | | | | 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 70986e19: am ab71f8b6: Merge "AArch64: Use of long for pointers in ↵Narayan Kamath2014-01-311-4/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PropertyValuesHolder" * commit '70986e197bbaf4de4f8126519a75df2b057c3b52': AArch64: Use of long for pointers in PropertyValuesHolder
| | * \ \ Merge "AArch64: Use of long for pointers in PropertyValuesHolder"Narayan Kamath2014-01-301-4/+4
| | |\ \ \
| | | * | | AArch64: Use of long for pointers in PropertyValuesHolderAshok Bhat2014-01-291-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Long is used in PropertyValuesHolder class to store native pointers as they can be 64-bit. Note that jmethodID, a pointer to structures, is also carried in long rather than int to support 64-bit system. Change-Id: Ifb514fc8473d7c41c0d6194fc6eb85d4816b2cd9 Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | | | Fix broken build in BridgeResourcesAlan Viverette2014-02-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iec58a2acda6b9538bcb5974d3d5c45ea6e53eac5
* | | | | | 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-2838-344/+344
| |\ \ \ | | |/ / | | | / | | |/ | |/| Change-Id: Ia110056e5fdd2387c207748b17c5c17d1a18ac5b
| | * Track 64bit changes to android/graphics.Narayan Kamath2014-01-2838-344/+344
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-255-89/+25
| | | | | | | | | | | | Change-Id: I1f0fc274b6a74dbcf0ed46175c4a2fa4c2dd9a63
| * | Update ICU_Delegate methods. DO NOT MERGEDeepanshu Gupta2013-11-181-2/+2
| |/ | | | | | | | | Bug: 11435966 Change-Id: Ib8ed2011fe62b2496795075b33b9ca7d5907b87a
| * Add libphonenumber to layoutlib.jar. DO NOT MERGEDeepanshu Gupta2013-11-132-1/+7
| | | | | | | | | | Issue: http://b.android.com/59497 Change-Id: Ief11e602703b6041db66241f1699cc1de72e65a5
| * Fix NPE in layoutlib. DO NOT MERGEDeepanshu Gupta2013-11-131-1/+0
| | | | | | | | Change-Id: I36623304d83b344ea078044001577b8005a63c02
| * 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