summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* am 2cb9147f: am 55542ee6: am 3e637042: Merge "Set default text style in ↵Xavier Ducrohet2014-02-201-0/+3
|\ | | | | | | | | | | | | layoutlib as NORMAL [DO NOT MERGE]" into klp-dev * commit '2cb9147fc49e6474eaf30fd833e43df10e42b899': Set default text style in layoutlib as NORMAL [DO NOT MERGE]
| * am 55542ee6: am 3e637042: Merge "Set default text style in layoutlib as ↵Xavier Ducrohet2014-02-201-0/+3
| |\ | | | | | | | | | | | | | | | | | | NORMAL [DO NOT MERGE]" into klp-dev * commit '55542ee6449bd580f61bc005726b5c87773fbe25': Set default text style in layoutlib as NORMAL [DO NOT MERGE]
| | * Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into ↵Xavier Ducrohet2014-02-201-0/+3
| | |\ | | | | | | | | | | | | klp-dev
| | | * Set default text style in layoutlib as NORMAL [DO NOT MERGE]Deepanshu 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 (cherry picked from commit 0acfb16dcd95468fe032204f54618e86becfd1eb)
* | | | am ca4b9a77: am e92c8542: am 01825b7a: Fix sans-serif-thin and ↵Deepanshu Gupta2014-02-201-3/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | sans-serif-light fonts in layoutlib. [DO NOT MERGE] * commit 'ca4b9a77e7d20703287b33b203b2582bd43f7792': Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
| * | | am e92c8542: am 01825b7a: Fix sans-serif-thin and sans-serif-light fonts in ↵Deepanshu Gupta2014-02-201-3/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | layoutlib. [DO NOT MERGE] * commit 'e92c8542a5cf1160a1b701b9f176af64ba46d68d': Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
| | * | Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]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 (cherry picked from commit e327212adde1136807bbdf052e8cc3861f8a6aba)
* | | am 56b86deb: am 1c91b1f7: am 45dbfcc7: Improve text rendering and measurement.Deepanshu Gupta2014-02-101-40/+45
|\ \ \ | |/ / | | | | | | | | | * commit '56b86debcfaf8f661011702d31854bb3804f5fe1': 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 3adb34ee: am 9fcfbfe2: am 3bf38b41: Merge "Add methods for Time_Delegate" ↵Deepanshu Gupta2014-02-062-3/+102
|\ \ \ | |/ / | | | | | | | | | | | | | | | into klp-dev * commit '3adb34ee079504b5854d23bc7a38dafc0a985219': 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 23de8dc2: am 28e049ef: am 0db6e6a5: Merge "Optimize layout rendering in ↵Deepanshu Gupta2014-02-061-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | layoutlib" into klp-dev * commit '23de8dc2625d4aeb4dc9085c5865ed571f96261a': 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 096e4359: am f2f108fe: am a955314d: Merge "Add missing files to fix ↵Deepanshu Gupta2014-02-069-31/+143
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | libphonenumber for layoutlib." into klp-dev * commit '096e43590381b218cec88adeac4261427c19e139': 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 5800b19a: am 50b0ce4e: am fd8cba3a: Merge "Fix the measurement of text ↵Deepanshu Gupta2014-02-063-41/+60
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | bounds." into klp-dev * commit '5800b19a7a3422620cb28e2327a96bf824f5cc9c': 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 b156c019: am d5129e75: am 8a892279: Fix a bug in Nine Patch library.Deepanshu Gupta2014-02-061-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'b156c0197d052dd4be71ad2b858acc01f50ad49f': 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
* | | Merge "Add support for multiple asset dirs (-A)" into klp-modular-devAdam Lesinski2014-02-045-25/+38
|\ \ \ | |/ / |/| |
| * | Add support for multiple asset dirs (-A)Adam Lesinski2014-01-235-25/+38
| | | | | | | | | | | | | | | Bug: 12608034 Change-Id: I02c5a1a73b83498d799570428cca3dd914f8ac11
* | | 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
* | | | am dff83e2b: am d5970e9c: Merge "AssetManager cookies should be int32_t and ↵Narayan Kamath2014-01-271-1/+1
|\ \ \ \ | |/ / / | | / / | |/ / |/| | | | | | | | not void*." * commit 'dff83e2b121b356a264e908f8a7d64584eab9b73': AssetManager cookies should be int32_t and not void*.
| * | AssetManager cookies should be int32_t and not void*.Narayan Kamath2014-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cookies are really indices into vectors and arrays, so they don't need to be void*. We choose int32_t instead of size_t to allow their width to be well specified. (cherry picked from commit ebfdd0f467e39c3af8d92cade78263935340acb7) (cherry picked from commit a7fa2e592e2e579e5acdb903dba83fc074ebc215) (cherry picked from commit a9d5701b034ed2d9771b3f0943e1add00741d7cd) Change-Id: I2aed3db568b6fdc487bf99e2c5dd123206736fda
* | | am 3da645f3: Merge "Don\'t pseudolocalize untranslatable strings."Narayan Kamath2013-12-181-5/+13
|\ \ \ | |/ / | | | | | | | | | * commit '3da645f307695949623d78f280ce12e932eb057c': Don't pseudolocalize untranslatable strings.
| * | Merge "Don't pseudolocalize untranslatable strings."Narayan Kamath2013-12-181-5/+13
| |\ \
| | * | Don't pseudolocalize untranslatable strings.Narayan Kamath2013-12-101-5/+13
| | | | | | | | | | | | | | | | | | | | bug: https://code.google.com/p/android/issues/detail?id=63004 Change-Id: I8e47a53d887144dc867111e42313d0e113b83ea1
* | | | am d21752df: Merge "Reimplement ZipFileRO in terms of libziparchive."Narayan Kamath2013-12-111-1/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'd21752dff45c7d8856e63026cfddc303a302df14': Reimplement ZipFileRO in terms of libziparchive.
| * | | Merge "Reimplement ZipFileRO in terms of libziparchive."Narayan Kamath2013-12-111-1/+2
| |\ \ \
| | * | | Reimplement ZipFileRO in terms of libziparchive.Narayan Kamath2013-12-091-1/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This lets us share zip archive processing code with both the runtime (Art, dalvik) and critical java code (StrictJarFile). This change also moves several utility methods to ZipUtils and dedups code across several zip inflation methods. One of the side effects of this change is that several processing loops are now O(n) instead of O(n^2). bug: 10193060 Change-Id: I3c7188496837a47246c4f342e45485a70fef3169
| | * | Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEADThe Android Open Source Project2013-11-2252-500/+1683
| | |\ \ | | | | | | | | | | | | | | | Change-Id: I938755073e70602cc8f51ce9bd420fdcf870cecd
* | | \ \ am b6f3708d: am 1044a1dc: Merge "Update delegate methods in layoutlib." into ↵Xavier Ducrohet2013-11-265-89/+25
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | klp-dev * commit 'b6f3708d330872232a6a57a1a5c0d2243fd7419e': Update delegate methods in layoutlib.
| * | | | Update delegate methods in layoutlib.Deepanshu Gupta2013-11-255-89/+25
| | | | | | | | | | | | | | | | | | | | Change-Id: I1f0fc274b6a74dbcf0ed46175c4a2fa4c2dd9a63
* | | | | am 5a0fd1fd: am 9d5a9434: Merge "Update ICU_Delegate methods. DO NOT MERGE" ↵Deepanshu Gupta2013-11-181-2/+2
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | | | | | | | | | | into klp-dev * commit '5a0fd1fd0fb5d734bf65d26e56e413dba2821b07': Update ICU_Delegate methods. DO NOT MERGE
| * | | Update ICU_Delegate methods. DO NOT MERGEDeepanshu Gupta2013-11-181-2/+2
| | | | | | | | | | | | | | | | | | | | Bug: 11435966 Change-Id: Ib8ed2011fe62b2496795075b33b9ca7d5907b87a
* | | | am ea04da7a: am 9570ed56: Merge "Add libphonenumber to layoutlib.jar. DO NOT ↵Deepanshu Gupta2013-11-182-1/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | MERGE" into klp-dev * commit 'ea04da7a183b526cdc79366822e4fc794d28cbd2': Add libphonenumber to layoutlib.jar. DO NOT MERGE
| * | | Add libphonenumber to layoutlib.jar. DO NOT MERGEDeepanshu Gupta2013-11-132-1/+7
| | | | | | | | | | | | | | | | | | | | Issue: http://b.android.com/59497 Change-Id: Ief11e602703b6041db66241f1699cc1de72e65a5
* | | | am 42453ede: am 599105a9: Merge "Fix NPE in layoutlib. DO NOT MERGE" into ↵Deepanshu Gupta2013-11-181-1/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | klp-dev * commit '42453ede3335aa5f7007a5b36749e84df83a08d4': Fix NPE in layoutlib. DO NOT MERGE
| * | | Fix NPE in layoutlib. DO NOT MERGEDeepanshu Gupta2013-11-131-1/+0
| | | | | | | | | | | | | | | | Change-Id: I36623304d83b344ea078044001577b8005a63c02
generated by cgit v1.1 at 2025-05-22 09:29:57 +0000