aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "ADT Resource Repo stores IDs and Called Once"Josiah Gaskin2011-08-029-204/+486
|\
| * ADT Resource Repo stores IDs and Called OnceJosiah Gaskin2011-08-019-204/+486
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes ADT parse out @+id declarations from layout and menu files and store them in its ResourceRepository. This eliminates the need to merge in IDs from the generated R.java in order to have a complete repository of resources. In order to do this, a new type of ResourceFile is created: IdGeneratingResourceFile which is used for xml files in menu/ and layout/. Also includes an IdResourceParser which finds all the declared IDs in an XML. This change also includes a change to the ResourceMananger to process raw deltas that can be provided either from the PreCompilerBuilder or from the GlobalProjectManager. This is to avoid duplicate deltas being passed to ResourceManager when autobuilding. Change-Id: I1c705a5f5a01ce7daa3eb76f14bd6cb9e11b5248
* | Merge "New plug-in supporting NDK with CDT"Xavier Ducrohet2011-08-0141-0/+2532
|\ \
| * | New plug-in supporting NDK with CDTDoug Schaefer2011-06-2941-0/+2532
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provides the Add Native Support menu item for Android projects. Provides build integration for ndk-build and Android toolchains. No debug support yet, but that's in the works. Includes a new feature for this that brings in CDT at install time. Scanner Discovery currently doesn't work on Windows but does on Mac/Linux. Fixed to adhere to Android coding standards. Change-Id: I26ddd622aaa3256e336804b1ace8163ed742e9b2 Signed-off-by: Doug Schaefer <cdtdoug@gmail.com>
* | | Merge "SDK Manager2 revamp of package display"Raphael Moll2011-08-012-267/+313
|\ \ \
| * | | SDK Manager2 revamp of package displayRaphael Moll2011-07-292-267/+313
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always compute the sort-by-api and the sort-by-source lists together. This allows the UI to change the display whilst the underlying packages are being updated. Change-Id: I6dc551bc27afa1b81bb4a26c236d8fcf5d910884
* | | | Merge "SDK Manager: Fix display of Archive sizes."Raphael Moll2011-08-012-4/+134
|\ \ \ \ | |/ / /
| * | | SDK Manager: Fix display of Archive sizes.Raphael Moll2011-07-292-4/+134
|/ / / | | | | | | | | | | | | | | | SDK Issue: 18875 Change-Id: I702e11cff07bded8e90d415541040fc06ceb7d49
* | | Merge "Make SDK Manager2 window app-modal."Raphael Moll2011-07-293-3/+3
|\ \ \
| * | | Make SDK Manager2 window app-modal.Raphael Moll2011-07-293-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | SDK Bug: 5097338 Change-Id: I3969ac6920e70513723a6fb917be520b59ebd7f1
* | | | Merge "Add Java Quick Assistant for Extracting Strings"Tor Norbye2011-07-2913-68/+346
|\ \ \ \ | |/ / / |/| | |
| * | | Add Java Quick Assistant for Extracting StringsTor Norbye2011-07-2913-68/+346
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset adds a Quick Assistant to Java files in Android projects, which proposes "Extract String" when the caret is within a String literal. It also moves a couple of utility methods from the Hyperlinks class to the AdtUtils class. Change-Id: Ica5ff40e32e3e145481d6c895178109289ed1d9b
* | | Merge "Add text support to asset studio wizard"Tor Norbye2011-07-291-25/+59
|\ \ \
| * | | Add text support to asset studio wizardTor Norbye2011-07-281-25/+59
| | | | | | | | | | | | | | | | Change-Id: I91fe21d73d642c1c5931ad346c7db7534a05262c
* | | | Merge "Add tooltip drag feedback for relative layout"Tor Norbye2011-07-295-20/+110
|\ \ \ \
| * | | | Add tooltip drag feedback for relative layoutTor Norbye2011-07-275-20/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset adds tooltip drag feedback for RelativeLayout. During dragging, the matched edge can quickly change from the left side to the right side or the top to the bottom edge, so the tooltip support now allows a client to specify where to align the tooltip not just at creation but also during updates. This is particularly important for RelativeLayout where we need to ensure that the tooltips do not obscure the constraint feedback arrows. And to prevent flicker, it uses a timer to ensure that there is at least 750 ms between the repositioning of the tooltip (but it will apply a side change immediately if it has been 750 ms since the last time the alignment changed). Change-Id: I8817db67844ad13c651d343ad310d8646e34dfca
* | | | | Merge "Back out quick-outline customization: Requires Eclipse 3.6"Tor Norbye2011-07-292-79/+0
|\ \ \ \ \
| * | | | | Back out quick-outline customization: Requires Eclipse 3.6Tor Norbye2011-07-292-79/+0
|/ / / / / | | | | | | | | | | | | | | | Change-Id: I7c529c81dd53c8ff0ad12ada78de2961910aa336
* | | | | Merge "Customize Quick Outline for Layout and Resource editors"Tor Norbye2011-07-292-0/+79
|\ \ \ \ \
| * | | | | Customize Quick Outline for Layout and Resource editorsTor Norbye2011-07-292-0/+79
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The XML editor has a Quick Outline (Cmd-O) but it only displays the tag name. This means that you only see "Button" instead of ids to distinguish similar widgets - and it also means that you can't filter based on the ids or names. This changeset adds a custom configuration for the XML quick outline used by the layout editor and the resource editor which includes the id or name attributes, and it also picks up the palette icons for the various widgets. Change-Id: I08e5d8d10f8f2ad0c2633488d3520d48da6c20cb
* | | | | Merge "Style: space after synchronized (object) {...}"Raphael Moll2011-07-294-14/+14
|\ \ \ \ \
| * | | | | Style: space after synchronized (object) {...}Raphael Moll2011-07-274-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For keywords such as if, for, while, we put a space between the keyword and the expression. Same should go for synchronized (object) {}. Change-Id: I5b145912f9346e3f4d8367865c2729abea68fdbc
* | | | | | Merge "SDK Manager2: Revamp progress bar handling."Raphael Moll2011-07-2917-142/+448
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | SDK Manager2: Revamp progress bar handling.Raphael Moll2011-07-2717-142/+448
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic5751f5c86f7cd4cf31927d83368a7fcb432e216
* | | | | Merge "Add a text rendering utility class to the Asset Studio library."Tor Norbye2011-07-282-4/+114
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add a text rendering utility class to the Asset Studio library.Roman Nurik2011-07-282-4/+114
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a text rendering utility class to the Asset Studio library. Also fix a tiny edge-case bug in image scaling. The text rendering class allows rendering a String with some options to a BufferedImage, for input as the sourceImage to a GraphicGenerator. Change-Id: I8e17e9a25ac2e48fa55e2994706aeb572da54223
* | | | Merge "Allow GridLayout to exist in project packages"Tor Norbye2011-07-272-2/+2
|\ \ \ \
| * | | | Allow GridLayout to exist in project packagesTor Norbye2011-07-272-2/+2
|/ / / / | | | | | | | | | | | | Change-Id: Ia455a9c9de853dcc0e5152a8b24a09192c39b3b4
* | | | Merge "18623: Adding ImageView in xml file causes crash of Eclipse"Tor Norbye2011-07-271-39/+50
|\ \ \ \
| * | | | 18623: Adding ImageView in xml file causes crash of EclipseTor Norbye2011-07-261-39/+50
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Catch exceptions encountered during preview rendering in resource choosers to ensure that they don't derail the chooser dialog. Change-Id: I6a0763cea2598b609283d284967c1121b1b18fdb
* | | | Merge "Asset Studio wizard"Tor Norbye2011-07-2772-36/+1492
|\ \ \ \
| * | | | Asset Studio wizardTor Norbye2011-07-2772-36/+1492
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an initial integration of the Android Asset Studio into Eclipse, as a New Asset wizard. It uses the Java port of the Android Asset Studio to generate the assets: https://code.google.com/a/google.com/p/android-asset-studio-java/ It only supports launcher icons, and some of the configurable parameters (file, shape, crop). To run it, put the AssetStudioLib.jar file into the the adt libs directory. There's a new "Asset Set" wizard in the New wizard, which will open up a two page wizard; the first page lets you select the project (which it attempts to pick up from context), as well as the type of asset to create, and the asset output name. In the second page there are the various widgets to tweak the code generator, and a preview area on the right which updates as you tweak the various controls. The main remaining work is to support additional asset types as they are added to the assetstudio generator library. Change-Id: I2e556337f8e5c3bc09e84b35a342ba05110abebc
* | | | Merge "Initial commit for the Asset Studio library in the SDK"Xavier Ducrohet2011-07-2755-0/+714
|\ \ \ \
| * | | | Initial commit for the Asset Studio library in the SDKRoman Nurik2011-07-1655-0/+714
| | | | | | | | | | | | | | | | | | | | Change-Id: I8f0aa6283af03c64c3563530defcf57ee2238bd8
* | | | | Merge "Fix undo problems in the XML editor (issue #15901)"Tor Norbye2011-07-272-74/+64
|\ \ \ \ \
| * | | | | Fix undo problems in the XML editor (issue #15901)Tor Norbye2011-07-142-74/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We've had a recurring problem where in difficult-to-reproduce circumstances the Undo button doesn't seem to work: After making some edits like dropping a button, each press of the Undo button will each individual edit of the compound operation, such as undoing each attribute set, each element add, and so on -- just as if the entire edit operation did not run under an undo lock. This changeset fixes this issue - or at least one scenario of it (tracked in http://code.google.com/p/android/issues/detail?id=15901 ) It turns out that Eclipse in some cases decides to "cancel" the current Undo operation. This is done in reaction to selection changes, and the logic for that is related to a user using a form editor to switch between various attribute fields, and expecting each text field edit to be separate. In the above issue I've listed a thread dump which shows one such cancellation which is definitely not desirable. To fix this bug we add a workaround: In our code which sets up the undo recording, we call "beginRecording" -repeatedly- (say 4 times). Since undo units are allowed to be nested, this means we're nesting our own undos 4 times, and when we're finished with the editing operation we simply call endRecording a corresponding number of times. This means that when the offending code comes around and calls StructuredTextUndoManager.forceEndOfPendingCommand it will subtract the command count by one, but we'll still be in one of our nested contexts (and the editor does allow extra endRecording calls to be called). Change-Id: Ic4dde029efcb18def3c9daa5d3676c49a815d804
* | | | | | Merge "Sort XML attributes logically"Tor Norbye2011-07-2711-21/+277
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | |
| * | | | Sort XML attributes logicallyTor Norbye2011-07-1411-21/+277
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset modifies the layout editor such that it writes attributes in a certain order: * id * style * layout_width * layout_height * other layout_ attributes, sorted alphabetically * other attributes, sorted alphabetically The layout editor will produce attributes in this order when - New widgets are dragged into the layout - Widgets are moved in the layout - It will also insert attributes in the right place when they are set as the result of (for example) using the context menu actions. Note that this ordering is applied unconditionally - there is no user setting to turn it off. However, note that the current behavior is random - moving a view for example will scramble the attributes (in an order which is related to hashkeys in a map), so the option would be "sort attributes logically" versus "sort attributes randomly"; if we want an option to "leave attribute order alone" that will need to be implemented. Limitations: - This does not yet modify the formatter to reorganize attributes. Thus, Ctrl-Shift-F to reformat the XML will not change attribute order. - It does not fix the problem that the XML model updater does not respect the formatting settings (such as one newline per attribute) when manipulating attributes. This will be addressed/worked around in subsequent CLs. Implementation Note: The Eclipse XML model updater will unconditionally *append* any new attributes. We take advantage of this to perform attribute sorting by ensuring that we always insert new attributes in the right order. We also check for existing attributes and any which fall lexicographically later than the new attributes are removed and reinserted in the right sequence. In order to avoid performing these removals and additions repeatedly on a node when we set multiple attributes, and to avoid flushing attribute changes *immediately* (which was the case until this), we now queue up all pending attribute values in the nodes and apply them at the end when all attribute changes for a given node are known. Change-Id: If39f8c29f26e281f7c6622a31e11ba49724d274a
* | | | | Merge changes I984ae397,I24f74378Raphael Moll2011-07-272-11/+71
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: SDK Man2: Clear local source caches when reloading. A few minor UI tweaks to SDK Manager 2.
| * | | | | SDK Man2: Clear local source caches when reloading.Raphael Moll2011-07-262-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I984ae397ada014ff8869d5775be1bc779ef22319
| * | | | | A few minor UI tweaks to SDK Manager 2.Raphael Moll2011-07-251-11/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Make the tree filter checkboxes (new, installed, obsolete) work again but this time by using a proper TreeViewer filter. - Fix missing name column icons in the TreeViewer. - Fix display of obsolete items, trimming the duplicated platform name when possible. Change-Id: I24f743788b01fe8c9c5f9a7f9b301f725e32f666
* | | | | | Merge "SDK Manager2: revamp package diff logic."Raphael Moll2011-07-2714-1352/+1817
|\ \ \ \ \ \ | |/ / / / /
| * | | | | SDK Manager2: revamp package diff logic.Raphael Moll2011-07-2514-1352/+1817
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This revamps the diff algorithm used to merge the local and remote packages found during a repository load into the PkgItems displayed in the tree viewer. FYI all the Package and Archive sub-classes are getting an equals() and hashCode() methods to make them behave correctly when put it in a HashTable or Set. These are the auto-generated stuff from Eclipse. Change-Id: I1494a0ed44cd768eed252e3a81b9e74bf86d563c
* | | | | Merge "Fix code completion handling for text selection"Tor Norbye2011-07-2717-36/+152
|\ \ \ \ \
| * | | | | Fix code completion handling for text selectionTor Norbye2011-07-2617-36/+152
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL fixes 18607: ADT 12 problems with xml files The bug is that if there is a text selection and you invoke code completion and select an alternative, the wrong number of characters is deleted as part of the replacement. The fix is simple: remove the code which adds in the selection count from the replacement string, since the complete replacement count is now already computed properly without regard for the selection (we should -always- replace the complete value token, not just the selection). Most of the diffs actually pertain to new unit tests for this because the testing infrastructure needed some changes to handle references to selection ranges rather than just caret offsets. There are also a couple of updates to some test goldenfiles unrelated to this fix, which updates the golden files to reflect recent changes like the package name of GestureOverlayViews and the @attr resource type in completion. Change-Id: Ie4f680f201930414457a79846f722db6efc89f93
* | | | | Merge "Fix 18539: "Extract Android String" mangles the replacement str"Tor Norbye2011-07-271-0/+9
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix 18539: "Extract Android String" mangles the replacement strTor Norbye2011-07-261-0/+9
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The refactoring could end up processing the current Java file twice - first using the normal code path, and a second time if the "Replace in All Java Files" checkbox was checked. This second pass would add a second set of edits which would mangle the file. Change-Id: I99ed50ab477af12d7fb54a7de6401689dad5d104
* | | | Merge "SDK Man2: New UTs for install/delete cases."Raphael Moll2011-07-253-37/+203
|\ \ \ \
| * | | | SDK Man2: New UTs for install/delete cases.Raphael Moll2011-07-213-37/+203
|/ / / / | | | | | | | | | | | | Change-Id: I1f1e95592f4946ab61ad512f187f87be60ea5834
* | | | Merge "Fix possible NPE in prop page if ProjectState is null."Xavier Ducrohet2011-07-211-2/+2
|\ \ \ \