summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* am b3ab070e: am 3a2d1c23: am ddb8e3b2: am 9bac0a9f: Merge "Fix to compile for...Xavier Ducrohet2011-07-202-4/+27
|\
| * am 3a2d1c23: am ddb8e3b2: am 9bac0a9f: Merge "Fix to compile for windows"Xavier Ducrohet2011-07-202-4/+27
| |\
| | * am ddb8e3b2: am 9bac0a9f: Merge "Fix to compile for windows"Xavier Ducrohet2011-07-202-4/+27
| | |\
| | | * am 9bac0a9f: Merge "Fix to compile for windows"Xavier Ducrohet2011-07-202-4/+27
| | | |\
| | | | * Fix to compile for windowsJosiah Gaskin2011-07-202-4/+27
* | | | | am 84be06e4: resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aospXavier Ducrohet2011-07-2020-13/+1206
|\ \ \ \ \ | |/ / / /
| * | | | resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aospXavier Ducrohet2011-07-2020-13/+1206
| |\ \ \ \ | | |/ / /
| | * | | am b582af31: am 0bc12a0b: Merge "Added Caching for PreProcessed PNGs"Xavier Ducrohet2011-07-2020-13/+1206
| | |\ \ \ | | | |/ /
| | | * | am 0bc12a0b: Merge "Added Caching for PreProcessed PNGs"Xavier Ducrohet2011-07-2020-13/+1206
| | | |\ \ | | | | |/
| | | | * Added Caching for PreProcessed PNGsJosiah Gaskin2011-07-2020-13/+1206
* | | | | am a125c937: resolved conflicts for merge of 2c311be7 to honeycomb-plus-aospXavier Ducrohet2011-07-208-26/+62
|\ \ \ \ \ | |/ / / /
| * | | | resolved conflicts for merge of 2c311be7 to honeycomb-plus-aospXavier Ducrohet2011-07-208-26/+62
| |\ \ \ \ | | |/ / /
| | * | | am 30824495: am 1e24ccbd: Merge "Add generation of dependency file for .ap_ p...Xavier Ducrohet2011-07-208-27/+63
| | |\ \ \ | | | |/ /
| | | * | am 1e24ccbd: Merge "Add generation of dependency file for .ap_ package"Xavier Ducrohet2011-07-208-27/+63
| | | |\ \ | | | | |/
| | | | * Add generation of dependency file for .ap_ packageJosiah Gaskin2011-07-188-27/+63
* | | | | Layoutlib: misc fix + start of AndroidBidi support.Xavier Ducrohet2011-07-195-27/+57
* | | | | am 9139868b: am ba6c98db: am 82943ecf: am d40c93f6: Merge "Add dependency gen...Xavier Ducrohet2011-07-197-18/+110
|\ \ \ \ \ | |/ / / /
| * | | | am ba6c98db: am 82943ecf: am d40c93f6: Merge "Add dependency generation to Aa...Xavier Ducrohet2011-07-197-18/+110
| |\ \ \ \ | | |/ / /
| | * | | am 82943ecf: am d40c93f6: Merge "Add dependency generation to Aapt for R.java"Xavier Ducrohet2011-07-198-19/+111
| | |\ \ \ | | | |/ /
| | | * | am d40c93f6: Merge "Add dependency generation to Aapt for R.java"Xavier Ducrohet2011-07-198-19/+111
| | | |\ \ | | | | |/
| | | | * Add dependency generation to Aapt for R.javaJosiah Gaskin2011-06-278-19/+111
* | | | | am bf31250b: am d5431ed5: am 2e659ae5: am 42755155: Merge "Copy once-created ...Xavier Ducrohet2011-07-193-1/+26
|\ \ \ \ \ | |/ / / /
| * | | | am d5431ed5: am 2e659ae5: am 42755155: Merge "Copy once-created R.java into l...Xavier Ducrohet2011-07-193-1/+26
| |\ \ \ \ | | |/ / /
| | * | | am 2e659ae5: am 42755155: Merge "Copy once-created R.java into library projects"Xavier Ducrohet2011-07-193-1/+26
| | |\ \ \ | | | |/ /
| | | * | am 42755155: Merge "Copy once-created R.java into library projects"Xavier Ducrohet2011-07-193-1/+26
| | | |\ \ | | | | |/
| | | | * Copy once-created R.java into library projectsJosiah Gaskin2011-06-273-1/+26
| | * | | am 4d825e1f: Merge "Bring in more layout lib changes from hc-mr1." into ginge...Xavier Ducrohet2011-06-2812-192/+322
| | |\ \ \
| | | * | | Bring in more layout lib changes from hc-mr1.Xavier Ducrohet2011-06-1612-192/+322
| | * | | | am 4753498d: Merge "CherryPick 06942bc4 from hc-mr1. do not merge." into ging...Xavier Ducrohet2011-06-282-4/+9
| | |\ \ \ \ | | | |/ / /
| | | * | | CherryPick 06942bc4 from hc-mr1. do not merge.Xavier Ducrohet2011-06-162-4/+9
| | * | | | am 9918ffb0: Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into ging...Xavier Ducrohet2011-06-283-16/+49
| | |\ \ \ \ | | | |/ / / | | | | / / | | | |/ / | | |/| |
| | | * | CherryPick 988eeeb5 from hc-mr1. do not merge.Xavier Ducrohet2011-06-163-16/+49
* | | | | Enable IMEs to set additional subtypes in backgroundsatok2011-07-191-1/+1
* | | | | Merge "Fix aidl to cope with multiple collection types per method."Elliott Hughes2011-07-144-111/+110
|\ \ \ \ \
| * | | | | Fix aidl to cope with multiple collection types per method.Elliott Hughes2011-07-134-111/+110
* | | | | | am 9163a4a6: am aa4b1d8b: am d292d2a0: Merge 36a3a392 from mr1.Xavier Ducrohet2011-07-131-0/+60
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am aa4b1d8b: am d292d2a0: Merge 36a3a392 from mr1.Xavier Ducrohet2011-07-111-0/+60
| |\ \ \ \ \
| | * | | | | Merge 36a3a392 from mr1.Xavier Ducrohet2011-07-111-0/+60
* | | | | | | LayoutLib: updated fake accessbility manager and ensure there's an InputMetho...Xavier Ducrohet2011-07-125-0/+291
* | | | | | | LayoutLib: Delegate for Display and IWindowManager implementation.Xavier Ducrohet2011-07-126-20/+639
* | | | | | | new button graphics for layoutlib.Xavier Ducrohet2011-07-119-0/+0
| |_|/ / / / |/| | | | |
* | | | | | am f9705ef6: am 2b5f2d01: am e2b41b0d: Merge "Laoutlib_creator: keep original...Raphael Moll2011-06-238-117/+319
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 2b5f2d01: am e2b41b0d: Merge "Laoutlib_creator: keep original of delegate ...Raphael Moll2011-06-228-117/+319
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | am e2b41b0d: Merge "Laoutlib_creator: keep original of delegate methods."Raphael Moll2011-06-228-117/+319
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Laoutlib_creator: keep original of delegate methods.Raphael Moll2011-06-178-117/+319
| | * | | | am d6ce6791: Merge "Cherrypick d1ed33c4 from hc-mr1. do not merge." into ging...Xavier Ducrohet2011-06-063-0/+86
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Cherrypick d1ed33c4 from hc-mr1. do not merge.Xavier Ducrohet2011-06-033-0/+86
| | * | | | am ee1b4976: Merge changes I035c48b9,Ib302af47,Iebda5ea6 into gingerbreadXavier Ducrohet2011-06-069-18/+15
| | |\ \ \ \ | | | |/ / /
| | | * | | Cherrypick 5b61ea6b from hc-mr1Xavier Ducrohet2011-06-031-1/+1
| | | * | | LayoutLib: enable the LAYOUT_ONLY capability.Xavier Ducrohet2011-06-021-1/+1