summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* am c0ea805c: am 2b30a4a5: Merge "ADT/Layoutlib: properly handle stroke ↵Xavier Ducrohet2010-01-212-2/+41
|\ | | | | | | | | | | | | | | | | information." into eclair Merge commit 'c0ea805c649666b55d4dde09eb72dcccfa8bccc3' * commit 'c0ea805c649666b55d4dde09eb72dcccfa8bccc3': ADT/Layoutlib: properly handle stroke information.
| * am 2b30a4a5: Merge "ADT/Layoutlib: properly handle stroke information." into ↵Xavier Ducrohet2010-01-182-2/+41
| |\ | | | | | | | | | | | | | | | | | | | | | | | | eclair Merge commit '2b30a4a50e24080fdd8b796e4a64447f223d4522' into eclair-plus-aosp * commit '2b30a4a50e24080fdd8b796e4a64447f223d4522': ADT/Layoutlib: properly handle stroke information.
| | * ADT/Layoutlib: properly handle stroke information.Xavier Ducrohet2010-01-142-2/+41
| | | | | | | | | | | | Change-Id: Iec9284d0e65d1313739e361d1fd5a522646fd1fd
* | | Merge "relocate GoogleLoginService"Doug Zongker2010-01-211-1/+0
|\ \ \
| * | | relocate GoogleLoginServiceDoug Zongker2010-01-211-1/+0
| | | | | | | | | | | | | | | | Change-Id: I79f4ff658ab136adcc54c432db76f34d2de5f6ac
* | | | am 20cc5570: am 79f05bb4: Merge "ADT/Layoutlib: improved gradient drawing ↵Xavier Ducrohet2010-01-211-3/+9
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | for perf." into eclair Merge commit '20cc55703348827fbd80ff0410777a537f01e10e' * commit '20cc55703348827fbd80ff0410777a537f01e10e': ADT/Layoutlib: improved gradient drawing for perf.
| * | | am 79f05bb4: Merge "ADT/Layoutlib: improved gradient drawing for perf." into ↵Xavier Ducrohet2010-01-141-3/+9
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | eclair Merge commit '79f05bb4a502d5768f84cf975f791f3ba981e0e5' into eclair-plus-aosp * commit '79f05bb4a502d5768f84cf975f791f3ba981e0e5': ADT/Layoutlib: improved gradient drawing for perf.
| | * | Merge "ADT/Layoutlib: improved gradient drawing for perf." into eclairXavier Ducrohet2010-01-141-3/+9
| | |\ \
| | | * | ADT/Layoutlib: improved gradient drawing for perf.Xavier Ducrohet2010-01-141-3/+9
| | | | | | | | | | | | | | | | | | | | Change-Id: I79b909d7787e4442e7cfdf196de1ac0c077da7f8
* | | | | am 38fa9eee: am 89d538dc: ADT/Layoutlib: don\'t draw 0-sized rectangle, AWT ↵Xavier Ducrohet2010-01-211-28/+32
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doesn\'t like that. Merge commit '38fa9eee9324b2355f28372e80dba12c1d7cc105' * commit '38fa9eee9324b2355f28372e80dba12c1d7cc105': ADT/Layoutlib: don't draw 0-sized rectangle, AWT doesn't like that.
| * | | | am 89d538dc: ADT/Layoutlib: don\'t draw 0-sized rectangle, AWT doesn\'t like ↵Xavier Ducrohet2010-01-141-28/+32
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that. Merge commit '89d538dcca9a4cb95682c56b0c4b85e8a77442be' into eclair-plus-aosp * commit '89d538dcca9a4cb95682c56b0c4b85e8a77442be': ADT/Layoutlib: don't draw 0-sized rectangle, AWT doesn't like that.
| | * | | ADT/Layoutlib: don't draw 0-sized rectangle, AWT doesn't like that.Xavier Ducrohet2010-01-141-28/+32
| | |/ / | | | | | | | | | | | | Change-Id: I298d00208ace2421478c5864cc5a66a508b2b411
* | | | am 895c92a4: am 240298f9: Merge "ADT/Layoutlib: always use custom gradient ↵Xavier Ducrohet2010-01-211-30/+17
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | (java) Paint." into eclair Merge commit '895c92a44b8bcf0aec7066c061293cafe12a76c2' * commit '895c92a44b8bcf0aec7066c061293cafe12a76c2': ADT/Layoutlib: always use custom gradient (java) Paint.
| * | | am 240298f9: Merge "ADT/Layoutlib: always use custom gradient (java) Paint." ↵Xavier Ducrohet2010-01-141-30/+17
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eclair Merge commit '240298f9e4542c487edd0337e84b50c493cbeecd' into eclair-plus-aosp * commit '240298f9e4542c487edd0337e84b50c493cbeecd': ADT/Layoutlib: always use custom gradient (java) Paint.
| | * | ADT/Layoutlib: always use custom gradient (java) Paint.Xavier Ducrohet2010-01-141-30/+17
| | | | | | | | | | | | | | | | | | | | | | | | The normal linear paint from AWT does not support our TileModes. Change-Id: I24667671dabdf1a5dffa342e4de9cc69487db0b6
* | | | am 31ef2e77: am b847fbf2: Merge "ADT/Layout: support for 3+ color in linear ↵Xavier Ducrohet2010-01-211-6/+243
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | | | | | | | gradients" into eclair Merge commit '31ef2e77c50485ad6ed410a5d341754d6787b8e1' * commit '31ef2e77c50485ad6ed410a5d341754d6787b8e1': ADT/Layout: support for 3+ color in linear gradients
| * | am b847fbf2: Merge "ADT/Layout: support for 3+ color in linear gradients" ↵Xavier Ducrohet2010-01-141-6/+243
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | into eclair Merge commit 'b847fbf2098acc8c5854bbbfa1453431128c720e' into eclair-plus-aosp * commit 'b847fbf2098acc8c5854bbbfa1453431128c720e': ADT/Layout: support for 3+ color in linear gradients
| | * ADT/Layout: support for 3+ color in linear gradientsXavier Ducrohet2010-01-141-6/+243
| | | | | | | | | | | | Change-Id: I14c6a5a1de41470c6f1c66d490492ecc727302f2
* | | am f95e3dd2: am 5e083024: ADT/Layoutlib: shader clean-up.Xavier Ducrohet2010-01-197-7/+14
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'f95e3dd23cb6cbd7a86dece3c4bafff71307721a' * commit 'f95e3dd23cb6cbd7a86dece3c4bafff71307721a': ADT/Layoutlib: shader clean-up.
| * | am 5e083024: ADT/Layoutlib: shader clean-up.Xavier Ducrohet2010-01-147-7/+14
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '5e083024269e7c5bf904301a98fa6eade6fec094' into eclair-plus-aosp * commit '5e083024269e7c5bf904301a98fa6eade6fec094': ADT/Layoutlib: shader clean-up.
| | * ADT/Layoutlib: shader clean-up.Xavier Ducrohet2010-01-147-7/+14
| | | | | | | | | | | | Change-Id: I0a200f438b7ccde2bfc19fd23614a647cb19d312
* | | am e1a99147: am d3026e16: Merge "ADT/Layoutlib: 2 color, linear gradient ↵Xavier Ducrohet2010-01-198-56/+92
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | support." into eclair Merge commit 'e1a991476365cf1a8249c842e2b936db6940b0a7' * commit 'e1a991476365cf1a8249c842e2b936db6940b0a7': ADT/Layoutlib: 2 color, linear gradient support.
| * | am d3026e16: Merge "ADT/Layoutlib: 2 color, linear gradient support." into ↵Xavier Ducrohet2010-01-148-56/+92
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | eclair Merge commit 'd3026e1618d893db55c2131d66b08bc4a6e7aaf4' into eclair-plus-aosp * commit 'd3026e1618d893db55c2131d66b08bc4a6e7aaf4': ADT/Layoutlib: 2 color, linear gradient support.
| | * ADT/Layoutlib: 2 color, linear gradient support.Xavier Ducrohet2010-01-138-56/+92
| | | | | | | | | | | | Change-Id: Ifaafa4fc42a22f4851449a7c35a5b82e211aafe7
* | | am 1da2735c: am f73bd14a: Merge "ADT/Layoutlib: implement ↵Xavier Ducrohet2010-01-192-18/+34
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Canvas.concat(Matrix)" into eclair Merge commit '1da2735c5862d48712706c2052a34e10e3dea43b' * commit '1da2735c5862d48712706c2052a34e10e3dea43b': ADT/Layoutlib: implement Canvas.concat(Matrix)
| * | am f73bd14a: Merge "ADT/Layoutlib: implement Canvas.concat(Matrix)" into eclairXavier Ducrohet2010-01-132-18/+34
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'f73bd14a8d5932b34a0e6e4d2de78b74705276b8' into eclair-plus-aosp * commit 'f73bd14a8d5932b34a0e6e4d2de78b74705276b8': ADT/Layoutlib: implement Canvas.concat(Matrix)
| | * ADT/Layoutlib: implement Canvas.concat(Matrix)Xavier Ducrohet2010-01-132-18/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevented ImageView from making proper use of ScaleType. Also fixed Canvas.getSaveCount() that returned the wrong value and Matrix.getTransform() which used the wrong order for the AffineTransform constructor!! Bug: 2364564 Change-Id: I78babf4aa6689440e52ad06b1473f75b20eb66da
* | | am cff6c845: am ae4bd059: ADT/Layoutlib: Reimplement parts of BitmapFactoryXavier Ducrohet2010-01-193-0/+605
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'cff6c8459ca05f3fee2d2999989d07a7176f955c' * commit 'cff6c8459ca05f3fee2d2999989d07a7176f955c': ADT/Layoutlib: Reimplement parts of BitmapFactory
| * | am ae4bd059: ADT/Layoutlib: Reimplement parts of BitmapFactoryXavier Ducrohet2010-01-133-0/+605
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'ae4bd059caa71aa4652c0f07fde7c2687169906e' into eclair-plus-aosp * commit 'ae4bd059caa71aa4652c0f07fde7c2687169906e': ADT/Layoutlib: Reimplement parts of BitmapFactory
| | * ADT/Layoutlib: Reimplement parts of BitmapFactoryXavier Ducrohet2010-01-133-0/+605
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original bitmap factory is mostly done in native and deals with the normal android Bitmap class which has been replaced in the layoutlib by a bitmap that is merely a wrapper around an AWT BufferedImage. This new BitmapFactory creates the layoutlib version of Bitmap all in Java. Change-Id: Ice8b5d19141a9a43f83349c159201bf85604b3b0
* | | am b4f41119: am a1d08886: Merge "Only output proguard keep for nonempty ↵Ying Wang2010-01-121-23/+25
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | attribute name in the AndroidManifest.xml." into eclair Merge commit 'b4f41119044e5ec7f7b76ed4ac02b5cfbaeb474d' * commit 'b4f41119044e5ec7f7b76ed4ac02b5cfbaeb474d': Only output proguard keep for nonempty attribute name in the AndroidManifest.xml.
| * | am a1d08886: Merge "Only output proguard keep for nonempty attribute name in ↵Ying Wang2010-01-121-23/+25
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | the AndroidManifest.xml." into eclair Merge commit 'a1d08886ec8549878ad16c19754a3239706fb61b' into eclair-plus-aosp * commit 'a1d08886ec8549878ad16c19754a3239706fb61b': Only output proguard keep for nonempty attribute name in the AndroidManifest.xml.
| | * Only output proguard keep for nonempty attribute name in the ↵Ying Wang2010-01-121-23/+25
| | | | | | | | | | | | | | | | | | | | | AndroidManifest.xml. Before this change, aapt generates proguard keep flags like "-keep class com.android.somepackage.", which proguard doesn't recognize.
* | | am f5a84f8a: am dfe25b0e: Merge "LayoutLib: support for custom styles." into ↵Xavier Ducrohet2010-01-111-3/+14
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | eclair Merge commit 'f5a84f8a7f91422f698ffbea3fabf77f2f7f77c8' * commit 'f5a84f8a7f91422f698ffbea3fabf77f2f7f77c8': LayoutLib: support for custom styles.
| * | am dfe25b0e: Merge "LayoutLib: support for custom styles." into eclairXavier Ducrohet2010-01-111-3/+14
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'dfe25b0e0c382d04a59bb03c7f5f8689ece5395e' into eclair-plus-aosp * commit 'dfe25b0e0c382d04a59bb03c7f5f8689ece5395e': LayoutLib: support for custom styles.
| | * LayoutLib: support for custom styles.Xavier Ducrohet2010-01-111-3/+14
| | | | | | | | | | | | Change-Id: Ic6c2ef234589f45db15024261d698066aa6e2f4e
* | | Fix duplicate constant in layoutbridge.Romain Guy2010-01-081-1/+1
| | |
* | | Deprecate fill_parent and introduce match_parent.Romain Guy2010-01-084-12/+14
| | | | | | | | | | | | Bug: #2361749.
* | | am de0ef181: am ce60d4b2: Merge "Move Layoutlib API library to sdk.git" into ↵Xavier Ducrohet2010-01-0712-642/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | eclair Merge commit 'de0ef181516ce13d292eafb741fa6c6b9dc1cb1c' * commit 'de0ef181516ce13d292eafb741fa6c6b9dc1cb1c': Move Layoutlib API library to sdk.git
| * | am ce60d4b2: Merge "Move Layoutlib API library to sdk.git" into eclairXavier Ducrohet2010-01-0712-642/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'ce60d4b27e17d98423fd339f61e8b746866f1f4e' into eclair-plus-aosp * commit 'ce60d4b27e17d98423fd339f61e8b746866f1f4e': Move Layoutlib API library to sdk.git
| | * Merge "Move Layoutlib API library to sdk.git" into eclairXavier Ducrohet2010-01-0712-642/+0
| | |\
| | | * Move Layoutlib API library to sdk.gitXavier Ducrohet2010-01-0712-642/+0
| | | | | | | | | | | | | | | | Change-Id: I53f1c5d52447b6215ae7a6f2f1f82d0879e952ca
* | | | am ce56857e: am cb2d50d0: Fix issue #2357259: aapt tool prints ↵Dianne Hackborn2010-01-071-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | "uses-configuation:" Merge commit 'ce56857ef72538c197afd91b9f30dc868d2667d9' * commit 'ce56857ef72538c197afd91b9f30dc868d2667d9': Fix issue #2357259: aapt tool prints "uses-configuation:"
| * | | am cb2d50d0: Fix issue #2357259: aapt tool prints "uses-configuation:"Dianne Hackborn2010-01-061-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'cb2d50d0d6e2e37ae02b014999da23ecd32038b8' into eclair-plus-aosp * commit 'cb2d50d0d6e2e37ae02b014999da23ecd32038b8': Fix issue #2357259: aapt tool prints "uses-configuation:"
| | * | Fix issue #2357259: aapt tool prints "uses-configuation:"Dianne Hackborn2010-01-061-1/+1
| | |/ | | | | | | | | | Change-Id: Id3ea3a86bd4d385441b05fcbe85b8ab62c35afff
| * | am 62d4395b: Merge change I6dc8a694 into eclairXavier Ducrohet2009-12-111-0/+3
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '62d4395bdb3114b9a75e46140456bc54fd13a3e7' into eclair-plus-aosp * commit '62d4395bdb3114b9a75e46140456bc54fd13a3e7': Layoutlib: Add a constant for default density value.
| * | am ce307f88: Merge change Ie4cdb5a3 into eclairXavier Ducrohet2009-12-093-6/+25
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'ce307f889b509143899a2221359219fbc91b618c' into eclair-plus-aosp * commit 'ce307f889b509143899a2221359219fbc91b618c': Add --custom-package to aapt
| * \ \ am 9ddb7df8: Fix build.Dianne Hackborn2009-11-161-6/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '9ddb7df88a62a131519264f75f5d6616ee11b6e6' into eclair-plus-aosp * commit '9ddb7df88a62a131519264f75f5d6616ee11b6e6': Fix build.
| * \ \ \ am 19e420c5: Merge change Iae493184 into eclairXavier Ducrohet2009-11-161-8/+11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '19e420c52dbe42e5b4b8b3580a5e7908cebec89d' into eclair-plus-aosp * commit '19e420c52dbe42e5b4b8b3580a5e7908cebec89d': Minor fix for the parent style computation in the layoutlib.
| * \ \ \ \ am ae210437: Merge change I7082e366 into eclairXavier Ducrohet2009-11-131-2/+12
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'ae2104371d84570011dbb8c1621832a132ed4584' into eclair-plus-aosp * commit 'ae2104371d84570011dbb8c1621832a132ed4584': Properly implement Paint.breakText for layoutlib.