summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* am 1da2735c: am f73bd14a: Merge "ADT/Layoutlib: implement Canvas.concat(Matri...Xavier Ducrohet2010-01-192-18/+34
|\
| * 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 cff6c845: am ae4bd059: ADT/Layoutlib: Reimplement parts of BitmapFactoryXavier Ducrohet2010-01-193-0/+605
|\ \ \ | |/ /
| * | 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 b4f41119: am a1d08886: Merge "Only output proguard keep for nonempty attri...Ying Wang2010-01-121-23/+25
|\ \ \ | |/ /
| * | 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 f5a84f8a: am dfe25b0e: Merge "LayoutLib: support for custom styles." into ...Xavier Ducrohet2010-01-111-3/+14
|\ \ \ | |/ /
| * | 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
* | | Fix duplicate constant in layoutbridge.Romain Guy2010-01-081-1/+1
* | | Deprecate fill_parent and introduce match_parent.Romain Guy2010-01-084-12/+14
* | | am de0ef181: am ce60d4b2: Merge "Move Layoutlib API library to sdk.git" into ...Xavier Ducrohet2010-01-0712-642/+0
|\ \ \ | |/ /
| * | 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 ce56857e: am cb2d50d0: Fix issue #2357259: aapt tool prints "uses-configua...Dianne Hackborn2010-01-071-1/+1
|\ \ \ \ | |/ / /
| * | | 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
| |\ \ | | |/
| * | am ce307f88: Merge change Ie4cdb5a3 into eclairXavier Ducrohet2009-12-093-6/+25
| |\ \
| * \ \ am 9ddb7df8: Fix build.Dianne Hackborn2009-11-161-6/+6
| |\ \ \
| * \ \ \ am 19e420c5: Merge change Iae493184 into eclairXavier Ducrohet2009-11-161-8/+11
| |\ \ \ \
| * \ \ \ \ am ae210437: Merge change I7082e366 into eclairXavier Ducrohet2009-11-131-2/+12
| |\ \ \ \ \
| * \ \ \ \ \ am 11cff8cd: Merge change Ie211adae into eclairMarco Nelissen2009-11-091-2/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am e6ab011b: Merge change Ib12bcb7f into eclairXavier Ducrohet2009-11-094-120/+333
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am 5fc71e67: am 00e44ef2: Merge change I54545dfd into eclair-sdkDirk Dougherty2009-11-042-9/+9
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am c54e0ce9: Merge change Ia86f2849 into eclairBrett Chabot2009-11-032-2/+2
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am 7580493b: Implement feature #2117336: Create event communication APIs for ...Dianne Hackborn2009-10-221-0/+19
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am 617262d8: Merge change I37c4157d into eclairDoug Zongker2009-10-203-8/+22
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am 5f9d4bae: layout lib tests cleanupXavier Ducrohet2009-10-075-320/+17
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ am 0a9d46b7: Add a test to make sure the replaced classes in layoutlib are co...Xavier Ducrohet2009-10-072-6/+146
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am 841a8eea: Merge change I24895c35 into eclairXavier Ducrohet2009-10-071-69/+294
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a970bf52: Merge change I34f51342 into eclairXavier Ducrohet2009-10-076-67/+53
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 71060f29: Merge change I8874a405 into eclairXavier Ducrohet2009-10-073-38/+86
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of ad2fa35d to masterTom Taylor2009-12-222-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d4a4729c: Update imports to android-commonTom Taylor2009-12-212-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | Update imports to android-commonTom Taylor2009-12-212-2/+2
* | | | | | | | | | | | | | | | | | | | am 451c850f: am 15f1bfb0: Merge change I70d0bddb into eclair-mr2Kenny Root2009-12-142-9/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | am 15f1bfb0: Merge change I70d0bddb into eclair-mr2Kenny Root2009-12-142-9/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | Merge change I70d0bddb into eclair-mr2Android (Google) Code Review2009-12-142-9/+17
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | Revise aapt options for UTF8/16 encodingKenny Root2009-12-112-9/+17
* | | | | | | | | | | | | | | | | | | | | am 092de0a9: am a7d461e0: am 62d4395b: Merge change I6dc8a694 into eclairXavier Ducrohet2009-12-131-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | am a7d461e0: am 62d4395b: Merge change I6dc8a694 into eclairXavier Ducrohet2009-12-131-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | am 62d4395b: Merge change I6dc8a694 into eclairXavier Ducrohet2009-12-131-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | / | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Layoutlib: Add a constant for default density value.Xavier Ducrohet2009-12-111-0/+3
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | am cdbf5746: am b5ef7ee1: Default to UTF8 resources when packaging with aaptKenny Root2009-12-112-3/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | am b5ef7ee1: Default to UTF8 resources when packaging with aaptKenny Root2009-12-102-3/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /