aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Improve the choice of default configurationTor Norbye2011-05-181-3/+48
|/ / /
* | | Merge "Fix bug in editor open utility"Tor Norbye2011-05-172-47/+55
|\ \ \
| * | | Fix bug in editor open utilityTor Norbye2011-05-172-47/+55
| | |/ | |/|
* | | merge from tools-adt_r11The Android Open Source Project2011-05-170-0/+0
|\ \ \ | |/ / |/| / | |/
| * Merge "Merge a109773a from master. do not merge." into tools-adt_r11Xavier Ducrohet2011-05-171-1/+1
| |\
| | * Merge a109773a from master. do not merge.Xavier Ducrohet2011-05-171-1/+1
| |/
* | Merge "Fragment Rendering Support"Tor Norbye2011-05-178-27/+382
|\ \
| * | Fragment Rendering SupportTor Norbye2011-05-178-27/+382
|/ /
* | Merge "Basic fragment support"Tor Norbye2011-05-1713-19/+329
|\ \
| * | Basic fragment supportTor Norbye2011-05-1613-19/+329
* | | Merge "Update layoutlib api level to 6."Xavier Ducrohet2011-05-171-1/+1
|\ \ \
| * | | Update layoutlib api level to 6.Xavier Ducrohet2011-05-161-1/+1
* | | | merge from tools-adt_r11The Android Open Source Project2011-05-170-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge "Merge 580ecb7a from master. do not merge." into tools-adt_r11Xavier Ducrohet2011-05-177-29/+231
| |\ \ \
| | * | | Merge 580ecb7a from master. do not merge.Xavier Ducrohet2011-05-177-29/+231
| |/ / /
* | | | merge from tools-adt_r11The Android Open Source Project2011-05-170-0/+0
|\ \ \ \ | |/ / /
| * | | Merge "Merge 'Remove "Android Tools > Convert to Android Project"' into tools...Raphael Moll2011-05-172-189/+0
| |\ \ \
| | * | | Merge 'Remove "Android Tools > Convert to Android Project"' into tools-adt_r11Raphael Moll2011-05-162-189/+0
| |/ / /
* | | | Merge "Plug in about/settings for SDK Manager 2."Raphael Moll2011-05-1715-99/+328
|\ \ \ \
| * | | | Plug in about/settings for SDK Manager 2.Raphael Moll2011-05-1315-99/+328
* | | | | Merge "Adjust "Compiler compliance" error to be more useful."Raphael Moll2011-05-174-20/+31
|\ \ \ \ \
| * | | | | Adjust "Compiler compliance" error to be more useful.Raphael Moll2011-05-124-20/+31
* | | | | | Merge "Fix space-in-dir issue with Proguard for the ant case."Raphael Moll2011-05-171-12/+26
|\ \ \ \ \ \
| * | | | | | Fix space-in-dir issue with Proguard for the ant case.Raphael Moll2011-05-121-12/+26
* | | | | | | Merge "Fix space-in-path proguard for ADT Export."Raphael Moll2011-05-171-43/+110
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fix space-in-path proguard for ADT Export.Raphael Moll2011-05-121-43/+110
* | | | | | | Merge "Fix proguard wrapper to capture all args."Raphael Moll2011-05-171-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fix proguard wrapper to capture all args.Raphael Moll2011-05-121-2/+2
| |/ / / / /
* | | | | | Merge "Binary XML editor"Tor Norbye2011-05-171-3/+13
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Binary XML editorHaris Peco2011-05-171-3/+13
|/ / / / /
* | | | | Merge "Add baseline/margins to ViewInfo."Xavier Ducrohet2011-05-167-29/+231
|\ \ \ \ \
| * | | | | Add baseline/margins to ViewInfo.Xavier Ducrohet2011-05-167-29/+231
* | | | | | Merge "Form editor up/down move accross siblings."Raphael Moll2011-05-162-18/+82
|\ \ \ \ \ \
| * | | | | | Form editor up/down move accross siblings.Raphael Moll2011-05-162-18/+82
* | | | | | | Merge "Fix Up/Down buttons in UiTreeBlock form editor."Raphael Moll2011-05-163-125/+293
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fix Up/Down buttons in UiTreeBlock form editor.Raphael Moll2011-05-163-125/+293
* | | | | | | Merge "Remove "Android Tools > Convert to Android Project""Raphael Moll2011-05-162-189/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Remove "Android Tools > Convert to Android Project"Raphael Moll2011-05-162-189/+0
|/ / / / / /
* | | | | | Merge "Move Grid{Data,Layout}Builder to SDK UI Lib"Raphael Moll2011-05-133-7/+10
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Move Grid{Data,Layout}Builder to SDK UI LibRaphael Moll2011-05-133-7/+10
* | | | | | Merge "Refactor some common Dialog methods in a base class."Raphael Moll2011-05-134-163/+261
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | Refactor some common Dialog methods in a base class.Raphael Moll2011-05-134-163/+261
| |/ / /
* | | | Merge "Make Go To Declaration work for <fragment> names."Tor Norbye2011-05-138-4/+101
|\ \ \ \
| * | | | Make Go To Declaration work for <fragment> names.Tor Norbye2011-05-138-4/+101
|/ / / /
* | | | Merge "Custom View handling improvements"Tor Norbye2011-05-139-12/+67
|\ \ \ \ | |/ / / |/| | |
| * | | Custom View handling improvementsTor Norbye2011-05-139-12/+67
| |/ /
* | | Merge "Escape Strings extracted with the Extract String refactoring"Tor Norbye2011-05-121-0/+31
|\ \ \ | |/ / |/| |
| * | Escape Strings extracted with the Extract String refactoringTor Norbye2011-05-121-0/+31
|/ /
* | Merge "Use enum for converting TouchPressType values"Bill Napier2011-05-118-72/+97
|\ \
| * | Use enum for converting TouchPressType valuesTerence Haddock2011-04-158-72/+97