aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fix in SdkSources."Pierre Zurek2011-01-151-1/+1
* Merge "Improve hyperlink resolution for configurations" into tools_r9Tor Norbye2011-01-144-128/+258
|\
| * Improve hyperlink resolution for configurationsTor Norbye2011-01-144-128/+258
|/
* Merge "Fix build by updating adt-test to the new LayoutLog." into tools_r9Xavier Ducrohet2011-01-141-3/+3
|\
| * Fix build by updating adt-test to the new LayoutLog.Xavier Ducrohet2011-01-141-3/+3
* | Merge "Fix build by updating ide-common to the new LayoutLog." into tools_r9Xavier Ducrohet2011-01-141-3/+3
|\ \ | |/
| * Fix build by updating ide-common to the new LayoutLog.Xavier Ducrohet2011-01-141-3/+3
* | Merge "Add optional data to LayoutLog API." into tools_r9Xavier Ducrohet2011-01-145-20/+122
|\ \ | |/
| * Add optional data to LayoutLog API.Xavier Ducrohet2011-01-145-20/+122
|/
* Merge "Zoom Improvements" into tools_r9Tor Norbye2011-01-149-21/+90
|\
| * Zoom ImprovementsTor Norbye2011-01-149-21/+90
|/
* Merge "Use LayoutLog.TAG_RESOURCES_PREFIX" into tools_r9Tor Norbye2011-01-141-2/+1
|\
| * Use LayoutLog.TAG_RESOURCES_PREFIXTor Norbye2011-01-131-2/+1
* | Merge "ProjectResources.getSourceFiles can now be configured to only return t...Xavier Ducrohet2011-01-131-1/+17
|\ \
| * | ProjectResources.getSourceFiles can now be configured to only return the best...Xavier Ducrohet2011-01-131-1/+17
* | | Merge "ProjectResources can now be queried for all source file for a given re...Xavier Ducrohet2011-01-131-0/+20
|\ \ \ | |/ / | | / | |/ |/|
| * ProjectResources can now be queried for all source file for a given resource.Xavier Ducrohet2011-01-131-0/+20
* | Merge "Add prefix constants for LayoutLog tags." into tools_r9Xavier Ducrohet2011-01-131-5/+7
|\ \ | |/
| * Add prefix constants for LayoutLog tags.Xavier Ducrohet2011-01-131-5/+7
* | Merge "Warn user about compilation errors causing rendering failures" into to...Tor Norbye2011-01-136-23/+198
|\ \ | |/ |/|
| * Warn user about compilation errors causing rendering failuresTor Norbye2011-01-136-23/+198
* | Merge "Add Layoutlib log tag constants to LayoutLog" into tools_r9Xavier Ducrohet2011-01-131-0/+16
|\ \ | |/ |/|
| * Add Layoutlib log tag constants to LayoutLogXavier Ducrohet2011-01-131-0/+16
|/
* Merge "Misc fix in ProjectCallback." into tools_r9Xavier Ducrohet2011-01-131-11/+9
|\
| * Misc fix in ProjectCallback.Xavier Ducrohet2011-01-121-11/+9
* | Merge "Remove <merge> from the palette" into tools_r9Tor Norbye2011-01-122-5/+14
|\ \ | |/ |/|
| * Remove <merge> from the paletteTor Norbye2011-01-122-5/+14
* | Merge "Fix MockLog to build on 1.5" into tools_r9Xavier Ducrohet2011-01-121-3/+0
|\ \
| * | Fix MockLog to build on 1.5Xavier Ducrohet2011-01-121-3/+0
|/ /
* | Merge "Merge 74f725db from master: Add snapshot handling for AVD creation, de...Xavier Ducrohet2011-01-1217-81/+651
|\ \
| * | Merge 74f725db from master: Add snapshot handling for AVD creation, details, ...Tim Baverstock2011-01-1217-81/+651
|/ /
* | Merge "New layoutlib API: getViewParent and getViewIndex" into tools_r9Xavier Ducrohet2011-01-121-0/+23
|\ \
| * | New layoutlib API: getViewParent and getViewIndexXavier Ducrohet2011-01-121-0/+23
| |/
* | Merge "Properly select dock/night mode combo when opening a layout." into too...Xavier Ducrohet2011-01-122-52/+129
|\ \
| * | Properly select dock/night mode combo when opening a layout.Xavier Ducrohet2011-01-122-52/+129
* | | Merge changes Ide9952df,I70fb1a71 into tools_r9Raphael Moll2011-01-125-5/+19
|\ \ \
| * | | Cleanup warnings in the form-based UI editor.Raphael Moll2011-01-124-5/+8
| * | | Make it possible to override the SDK path using an env varRaphael Moll2011-01-121-0/+11
| | |/ | |/|
* | | Merge "Resource parser should strip unescaped " from string values." into too...Xavier Ducrohet2011-01-121-0/+8
|\ \ \ | |/ / |/| / | |/
| * Resource parser should strip unescaped " from string values.Xavier Ducrohet2011-01-121-0/+8
* | Merge "Choose a good locale when opening a file for the first time." into too...Xavier Ducrohet2011-01-111-7/+72
|\ \ | |/
| * Choose a good locale when opening a file for the first time.Xavier Ducrohet2011-01-111-7/+72
* | Merge "Reorder animation submenu" into tools_r9Tor Norbye2011-01-111-25/+15
|\ \ | |/ |/|
| * Reorder animation submenuTor Norbye2011-01-111-25/+15
|/
* Merge "Don't reopen a layout if it's already opened." into tools_r9Xavier Ducrohet2011-01-112-3/+7
|\
| * Don't reopen a layout if it's already opened.Xavier Ducrohet2011-01-112-3/+7
* | Merge "Use res/animator rather than res/anim for the Play Animation code" int...Tor Norbye2011-01-112-4/+24
|\ \ | |/ |/|
| * Use res/animator rather than res/anim for the Play Animation codeTor Norbye2011-01-112-4/+24
|/
* Merge "This is tools r9 in tools_r9. DO NOT MERGE." into tools_r9Xavier Ducrohet2011-01-111-1/+1
|\
| * This is tools r9 in tools_r9. DO NOT MERGE.Xavier Ducrohet2011-01-111-1/+1