summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge "long modifier was on the wrong argument."Jean-Baptiste Queru2010-05-101-1/+1
|\
| * long modifier was on the wrong argument.Scott Turner2010-01-141-1/+1
| * merge from eclairJean-Baptiste Queru2009-11-1552-823/+4890
| |\
| | * eclair snapshotJean-Baptiste Queru2009-11-1363-843/+4907
* | | am 2be56ccb: Merge "Add --auto-add-overlay option to aapt. DO NOT MERGE" into...Xavier Ducrohet2010-02-124-7/+17
|\ \ \
| * | | Add --auto-add-overlay option to aapt. DO NOT MERGEXavier Ducrohet2010-02-124-7/+17
* | | | am 6f9e2c64: Merge "Find layout classes in all "layout-*" dirs." into eclairYing Wang2010-01-211-3/+9
|\ \ \ \ | |/ / /
| * | | Find layout classes in all "layout-*" dirs.Ying Wang2010-01-201-3/+9
* | | | am b44051ee: Merge "ADT/Layoutlib: implement sweep gradient." into eclairXavier Ducrohet2010-01-203-60/+140
|\ \ \ \ | |/ / /
| * | | ADT/Layoutlib: implement sweep gradient.Xavier Ducrohet2010-01-193-60/+140
* | | | am 6866daee: Merge "ADT/Layoutlib: implement radial gradient." into eclairXavier Ducrohet2010-01-193-219/+338
|\ \ \ \ | |/ / /
| * | | Merge "ADT/Layoutlib: implement radial gradient." into eclairXavier Ducrohet2010-01-193-219/+338
| |\ \ \
| | * | | ADT/Layoutlib: implement radial gradient.Xavier Ducrohet2010-01-193-219/+338
* | | | | am b5fb50a1: Merge "Add instrumentation as a source tag for proguard keep opt...Ying Wang2010-01-191-36/+44
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Add instrumentation as a source tag for proguard keep options." into e...Ying Wang2010-01-191-36/+44
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Add instrumentation as a source tag for proguard keep options.Ying Wang2010-01-131-36/+44
* | | | | am 908a8111: Merge "ADT/Layoutlib: Add dash support to stroke." into eclairXavier Ducrohet2010-01-183-38/+92
|\ \ \ \ \ | |/ / / /
| * | | | ADT/Layoutlib: Add dash support to stroke.Xavier Ducrohet2010-01-153-38/+92
* | | | | am 2b30a4a5: Merge "ADT/Layoutlib: properly handle stroke information." into ...Xavier Ducrohet2010-01-182-2/+41
|\ \ \ \ \ | |/ / / /
| * | | | ADT/Layoutlib: properly handle stroke information.Xavier Ducrohet2010-01-142-2/+41
* | | | | am 79f05bb4: Merge "ADT/Layoutlib: improved gradient drawing for perf." into ...Xavier Ducrohet2010-01-141-3/+9
|\ \ \ \ \ | |/ / / /
| * | | | 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
* | | | | | am 89d538dc: ADT/Layoutlib: don\'t draw 0-sized rectangle, AWT doesn\'t like ...Xavier Ducrohet2010-01-141-28/+32
|\ \ \ \ \ \ | |/ / / / /
| * | | | | ADT/Layoutlib: don't draw 0-sized rectangle, AWT doesn't like that.Xavier Ducrohet2010-01-141-28/+32
| |/ / / /
* | | | | am 240298f9: Merge "ADT/Layoutlib: always use custom gradient (java) Paint." ...Xavier Ducrohet2010-01-141-30/+17
|\ \ \ \ \ | |/ / / /
| * | | | ADT/Layoutlib: always use custom gradient (java) Paint.Xavier Ducrohet2010-01-141-30/+17
* | | | | am b847fbf2: Merge "ADT/Layout: support for 3+ color in linear gradients" int...Xavier Ducrohet2010-01-141-6/+243
|\ \ \ \ \ | |/ / / /
| * | | | ADT/Layout: support for 3+ color in linear gradientsXavier Ducrohet2010-01-141-6/+243
* | | | | am 5e083024: ADT/Layoutlib: shader clean-up.Xavier Ducrohet2010-01-147-7/+14
|\ \ \ \ \ | |/ / / /
| * | | | ADT/Layoutlib: shader clean-up.Xavier Ducrohet2010-01-147-7/+14
* | | | | am d3026e16: Merge "ADT/Layoutlib: 2 color, linear gradient support." into ec...Xavier Ducrohet2010-01-148-56/+92
|\ \ \ \ \ | |/ / / /
| * | | | ADT/Layoutlib: 2 color, linear gradient support.Xavier Ducrohet2010-01-138-56/+92
* | | | | am f73bd14a: Merge "ADT/Layoutlib: implement Canvas.concat(Matrix)" into eclairXavier Ducrohet2010-01-132-18/+34
|\ \ \ \ \ | |/ / / /
| * | | | ADT/Layoutlib: implement Canvas.concat(Matrix)Xavier Ducrohet2010-01-132-18/+34
* | | | | am ae4bd059: ADT/Layoutlib: Reimplement parts of BitmapFactoryXavier Ducrohet2010-01-133-0/+605
|\ \ \ \ \ | |/ / / /
| * | | | ADT/Layoutlib: Reimplement parts of BitmapFactoryXavier Ducrohet2010-01-133-0/+605
| |/ / /
* | | | am a1d08886: Merge "Only output proguard keep for nonempty attribute name in ...Ying Wang2010-01-121-23/+25
|\ \ \ \ | |/ / /
| * | | Only output proguard keep for nonempty attribute name in the AndroidManifest....Ying Wang2010-01-121-23/+25
* | | | am dfe25b0e: Merge "LayoutLib: support for custom styles." into eclairXavier Ducrohet2010-01-111-3/+14
|\ \ \ \ | |/ / /
| * | | LayoutLib: support for custom styles.Xavier Ducrohet2010-01-111-3/+14
* | | | am ce60d4b2: Merge "Move Layoutlib API library to sdk.git" into eclairXavier Ducrohet2010-01-0712-642/+0
|\ \ \ \ | |/ / /
| * | | 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
* | | | | am cb2d50d0: Fix issue #2357259: aapt tool prints "uses-configuation:"Dianne Hackborn2010-01-061-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Fix issue #2357259: aapt tool prints "uses-configuation:"Dianne Hackborn2010-01-061-1/+1
| |/ / /
* | | | am 62d4395b: Merge change I6dc8a694 into eclairXavier Ducrohet2009-12-111-0/+3
|\ \ \ \ | |/ / /
| * | | Layoutlib: Add a constant for default density value.Xavier Ducrohet2009-12-111-0/+3
* | | | am ce307f88: Merge change Ie4cdb5a3 into eclairXavier Ducrohet2009-12-093-6/+25
|\ \ \ \ | |/ / /
| * | | Add --custom-package to aaptXavier Ducrohet2009-11-303-6/+25