aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Merge 74f725db from master: Add snapshot handling for AVD creation, ↵Xavier Ducrohet2011-01-1217-81/+651
|\ | | | | | | details, and launch" into tools_r9
| * Merge 74f725db from master: Add snapshot handling for AVD creation, details, ↵Tim Baverstock2011-01-1217-81/+651
|/ | | | | | | | and launch Also respect 'Wipe User Data' by disabling snapshot launch, and support 'Edit AVD'. Change-Id: I2fee9361d78d70b80314523e36b48fbd80b03ca7
* 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
| | | | | | | | Change-Id: I201e42a9a7e31fcef8b7a0c5b91a6abd5d5407bd
* | Merge "Properly select dock/night mode combo when opening a layout." into ↵Xavier Ducrohet2011-01-122-52/+129
|\ \ | | | | | | | | | tools_r9
| * | Properly select dock/night mode combo when opening a layout.Xavier Ducrohet2011-01-122-52/+129
| | | | | | | | | | | | Change-Id: I3c4f8b875f263970e4c8fc308b466ae14c69c438
* | | Merge changes Ide9952df,I70fb1a71 into tools_r9Raphael Moll2011-01-125-5/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | * changes: Cleanup warnings in the form-based UI editor. Make it possible to override the SDK path using an env var
| * | | Cleanup warnings in the form-based UI editor.Raphael Moll2011-01-124-5/+8
| | | | | | | | | | | | | | | | Change-Id: Ide9952dfefeb86e59d4ed5b1db25150625a54143
| * | | Make it possible to override the SDK path using an env varRaphael Moll2011-01-121-0/+11
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | The value will only be used if it matches an existing directory. Useful for testing from Eclipse. Note: this is a hack that does not change the preferences, so if the user looks at Window > Preferences > Android, the path will be the preferences one and not the overriden one. Change-Id: I70fb1a7117f56d4c6e5cab253c3323480605413f
* | | Merge "Resource parser should strip unescaped " from string values." into ↵Xavier Ducrohet2011-01-121-0/+8
|\ \ \ | |/ / |/| / | |/ tools_r9
| * Resource parser should strip unescaped " from string values.Xavier Ducrohet2011-01-121-0/+8
| | | | | | | | Change-Id: I15cc5becdf139a7eeb01309d0d903a35ba773ed9
* | Merge "Choose a good locale when opening a file for the first time." into ↵Xavier Ducrohet2011-01-111-7/+72
|\ \ | |/ | | | | tools_r9
| * Choose a good locale when opening a file for the first time.Xavier Ducrohet2011-01-111-7/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because the selection of the full config to use for display is complicated (due to having to find something that matches the configuration of the edited file), this is a bit more complex than simply changing the select in updateLocales(). In fact the selection made there when there is no stored config is pointless. Instead it's decided later by findAndSetCompatibleConfig which find the proper combination of device and locale* * this is actually broken since we added the nightmode and dock mode. We need to include those in the list of config we try out. I'll fix this in a later patch. Change-Id: I83599dc7f0d1a921f9568b6de5c065ca1e82e103
* | Merge "Reorder animation submenu" into tools_r9Tor Norbye2011-01-111-25/+15
|\ \ | |/ |/|
| * Reorder animation submenuTor Norbye2011-01-111-25/+15
|/ | | | | | | List local animations first, followed by the Create button, followed by the frameworks animation submenu. Also drop the recent-item. Change-Id: I238ab85f319383c138ce8e63fd19c7f97a23ea5e
* 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
| | | | | | | | | | | | | | | | | | | | This is for the case where a layout is opened and Eclipse tell its editor to re-open it because it was double clicked again in the package explorer due to the MatchingStrategy having returned true. Change-Id: I404494b990215bcdff163a382ecb411e2efb9b51 Misc: reorder configs for the WXGA device config.
* | Merge "Use res/animator rather than res/anim for the Play Animation code" ↵Tor Norbye2011-01-112-4/+24
|\ \ | |/ |/| | | into tools_r9
| * Use res/animator rather than res/anim for the Play Animation codeTor Norbye2011-01-112-4/+24
|/ | | | | | | | | | We should be using ResourceType.ANIMATOR rather than ResourceType.ANIM for the designtime playable animations. Simple tweak to make the "Create Animation" dialog able to create files into res/animator/, though this needs to be improved (with proper animator/interpolator root elements etc). Change-Id: I70a504fbd946da3ff161f9cf953b878a41886fee
* 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
| | | | | | | | Change-Id: I4d6d8cd74abd2cb3b9087ac4f30b761d803e15e3
* | Merge "Wrap error text" into tools_r9Tor Norbye2011-01-111-1/+1
|\ \ | |/ |/|
| * Wrap error textTor Norbye2011-01-111-1/+1
| | | | | | | | | | | | | | | | Wide lines in the error label for rendering errors were not wrapped. Annoying when you're trying to copy & paste a path out of it to examine the file in question, etc. Change-Id: I29b5a8cb25e26dbf8e5a5314bb82c400352e6760
* | Merge "Reformat changes.txt" into tools_r9Tor Norbye2011-01-111-134/+306
|\ \
| * | Reformat changes.txtTor Norbye2011-01-111-134/+306
| |/ | | | | | | | | | | Make the changes.txt wrap such that it's easier to read long lines. Change-Id: I037751470aab172fc486530bad645beb2ed487a2
* | Merge "Remove error(tag, throwable) from LayoutLog." into tools_r9Xavier Ducrohet2011-01-114-29/+4
|\ \ | |/ |/|
| * Remove error(tag, throwable) from LayoutLog.Xavier Ducrohet2011-01-114-29/+4
| | | | | | | | | | | | | | | | | | | | | | | | We should never only log an exception with no associated message. Also, I've found several case in the layoutlib where there is a message in place of the tag. This new API makes it more clear that there's both a tag and a message since both are required for error() Change-Id: I6d5f45c07b1cb8df96311d930170526bb729fae6
* | Merge "Additions to changes.txt" into tools_r9Tor Norbye2011-01-111-3/+9
|\ \
| * | Additions to changes.txtTor Norbye2011-01-111-3/+9
|/ / | | | | | | Change-Id: Ib94abd4c1006a88e3e3db6b9e7e0e528ffb52316
* | Merge "Changes to widget text and id format" into tools_r9Tor Norbye2011-01-114-16/+17
|\ \
| * | Changes to widget text and id formatTor Norbye2011-01-114-16/+17
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset changes the default text and id attributes of newly dropped widgets in the following ways: 1. Use the node class name rather than the id as the initial text. In other words, the default label for a button is "Button" rather than "@+id/Button01". This is a more common convention in other GUI builders, and you typically don't want the actual label to be "@+id"-something, you want it to be "@string"-something, so the @id prefix is slightly confusing for beginners. 2. The id uses method name capitalization rather than class name capitalization, e.g. "checkBox" rather than "CheckBox". This seems to be the convention I see in handwritten layouts, which makes sense given that the reference will be compiled to and referenced as a Java field. 3. In the case of conflicts, don't use a leading 0; in other words, rather than button01, button02, button03 we have button1, button2, button3. It's unlikely that the user will have ten or more unnamed widgets (and if they do the leading zero still isn't needed.) The code which looks for name conflicts now also performs case insensitive comparisons. Change-Id: Ie7f2c5dd8e9852acec2c2e154ee20142b8ece9a6
* | Merge "Make the error text participate in select all and copy" into tools_r9Tor Norbye2011-01-113-3/+44
|\ \
| * | Make the error text participate in select all and copyTor Norbye2011-01-113-3/+44
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When there are rendering errors, the error messages are listed in a StyledText widget which opens up at the bottom of the layout editor. This changeset makes it possible to copy & paste the error message. It does this by: - Making the global Select All action operate on the error label when the error label has focus - Make the global Copy action operate on the error label if the error label has selected text (which could have been made selected either by the Select All action above, or by a manual mouse selection) Change-Id: Ia7f267737a0d43a54dce8cf6b5f5802aef038881
* | Merge "Merge into f9297748 r9: Handle Animator and Interpolator resources." ↵Xavier Ducrohet2011-01-115-2/+18
|\ \ | |/ | | | | into tools_r9
| * Merge into f9297748 r9: Handle Animator and Interpolator resources.Xavier Ducrohet2011-01-115-2/+18
|/ | | | Change-Id: I85242fb436e7de99887bd60b320a16a051bddc51
* reconcile standalone tools_r9 into masterJean-Baptiste Queru2011-01-100-0/+0
|\ | | | | | | Change-Id: I822ae7661ec1a4f2995176bf592c7bbbf83e57bb
| * Merge "Update changes.txt. Do not merge." into tools_r9Raphael Moll2011-01-101-1/+4
| |\
| | * Update changes.txt. Do not merge.Raphael Moll2011-01-071-1/+4
| | | | | | | | | | | | Change-Id: Ibab7af837652986a5037c745a0093c6a592274f5
| * | Merge "Merge: Cleanup ArrayList usage in SDK Manager." into tools_r9Raphael Moll2011-01-104-30/+34
| |\ \ | | |/
| | * Merge: Cleanup ArrayList usage in SDK Manager.Raphael Moll2011-01-074-30/+34
| | | | | | | | | | | | Change-Id: Id03b96aa420a0aa83771c60880887577fd8c020e
| * | Merge "Merge: SdkManager: suggest which platform to install to fix a broken ↵Raphael Moll2011-01-1010-12/+349
| |\ \ | | |/ | | | | | | addon." into tools_r9
| | * Merge: SdkManager: suggest which platform to install to fix a broken addon.Raphael Moll2011-01-0710-12/+349
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SDK Manager now has the notion of a "broken installed package". The BrokenPackage can specify that: - it requires a certain minimal platform to be installed, and/or: - it requires a specific exact platform to be installed. The later constraint is expressed by IExactApiLevelDependency and allows UpdaterLogic to find which platform would fix an addon which is missing its base platform. Change-Id: I0215900f499014038ba9470b5fcff4c60a24c536
| * | Merge "Merge: Support broken addons in SDK Manager UI." into tools_r9Raphael Moll2011-01-1011-194/+626
| |\ \ | | |/
| | * Merge: Support broken addons in SDK Manager UI.Raphael Moll2011-01-0711-194/+626
| | | | | | | | | | | | Change-Id: I21cbd773a941d5b74676d154c42be959497b2f5f
| * | Merge "Merge: SDK Manager: specify proxy on no-UI command-line." into tools_r9Raphael Moll2011-01-105-18/+115
| |\ \ | | |/
| | * Merge: SDK Manager: specify proxy on no-UI command-line.Raphael Moll2011-01-075-18/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds 2 flags to specify the http/https proxy host/port on the command line when using the console-base "no-ui" SDK update. The command-line proxy values override settings if defined. Also revamped the argument help display to support larger command-line long argument sizes and mandate that arguments can have one of ther short or long argument name optional. Change-Id: I013a1e5e9aa8e71f2f3e5f807a0363af86092ac1
| * | Merge "Merge: Load and apply proxy settings from config file in ↵Raphaël Moll2011-01-101-1/+6
| |\ \ | | |/ | | | | | | UpdateNoWindow, allowing headless updates to work behind a proxy." into tools_r9
| | * Merge: Load and apply proxy settings from config file in UpdateNoWindow, ↵Christopher Orr2011-01-071-1/+6
| | | | | | | | | | | | | | | | | | allowing headless updates to work behind a proxy. Change-Id: I9d3973ff1e6f17765098670e0cabe852d1352d1f
| * | Merge "Merge: Set 'https' proxy system properties using the 'http' settings, ↵Raphaël Moll2011-01-101-5/+13
| |\ \ | | |/ | | | | | | allowing downloads via an HTTPS proxy to work." into tools_r9
| | * Merge: Set 'https' proxy system properties using the 'http' settings, ↵Christopher Orr2011-01-071-5/+13
| | | | | | | | | | | | | | | | | | allowing downloads via an HTTPS proxy to work. Change-Id: Ic2ad4c0b4565c1a7148a7635c3f745b52448b986
generated by cgit v1.1 at 2025-06-01 13:03:58 +0000