aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Add eclipse version to usage stat ping."Xavier Ducrohet2011-08-044-15/+32
|\
| * Add eclipse version to usage stat ping.Xavier Ducrohet2011-08-044-15/+32
| | | | | | | | Change-Id: I14dba0dd7cb900c2e700e4da055aee7bb7d1f9cd
* | Merge "Add pushFile/pullFile interface for IDevice."Xavier Ducrohet2011-08-042-0/+91
|\ \
| * | Add pushFile/pullFile interface for IDevice.Wei-Ning Huang2011-08-052-0/+91
| | | | | | | | | | | | | | | | | | Implement pushFile/pullFile methods for Device. Change-Id: I8491f98fc46bbfd5f476b72e002cd97f63c56228
* | | Merge "Split PackagesPage and PackageLoader inner classes."Raphael Moll2011-08-048-1242/+1347
|\ \ \
| * | | Split PackagesPage and PackageLoader inner classes.Raphael Moll2011-08-048-1242/+1347
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PackagesPage and PackageLoader have quite a number of inner classes. This splits them in separate package-protected classes, making the page source a tad shorter. This is a pure refactoring move/rename. No logic is modified. Change-Id: I88885aed40e34bd28de4b1ea4e1de66ea2ed89b8
* | | | Merge "SDK Manager: refactor classes for manager 1 versus 2."Raphael Moll2011-08-0423-34/+75
|\ \ \ \ | |/ / /
| * | | SDK Manager: refactor classes for manager 1 versus 2.Raphael Moll2011-08-0423-34/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves SDK Manager 1 versus 2 classes in different packages, ..repository.sdkman1 versus ..repository.sdkman2. There is no change to any actual logic. Only edits to fix imports and make some classes public. Change-Id: Ia5ea2ef55fb6913816b27d81c496434d80a00c58
* | | | Merge "SdkManager2: UTs for initial platform selection."Raphael Moll2011-08-043-1/+124
|\ \ \ \ | |/ / /
| * | | SdkManager2: UTs for initial platform selection.Raphael Moll2011-08-043-1/+124
| | | | | | | | | | | | | | | | Change-Id: I4aef0e6ad8993e792a20f95f37a62f44e858b426
* | | | Merge "SdkMan2: only select recent new platforms."Raphael Moll2011-08-041-3/+66
|\ \ \ \ | |/ / /
| * | | SdkMan2: only select recent new platforms.Raphael Moll2011-08-041-3/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Try to add some heuristic to select new/updates so that we only select new stuff from platforms the user has or the top most recent platform. Change-Id: I3b4c7a3b515bdee8393a248493d2dc475f2f5745
* | | | Merge "Fix NPE"Tor Norbye2011-08-041-3/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix NPETor Norbye2011-08-041-3/+5
|/ / / | | | | | | | | | Change-Id: I044342e5aa6b3aaa87efdcc79bbcb3db93190252
* | | Merge "Fix formatting bug for formatting ranges"Tor Norbye2011-08-041-1/+3
|\ \ \
| * | | Fix formatting bug for formatting rangesTor Norbye2011-08-031-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug discovered by Raphael, where you select a portion of a node and then try to format it; the bug happens if the node is indented at column 0. I'll add unit tests for this in the next checkin along with wider tests for node-replacements. Change-Id: I6488dce530e0663c83b063da906ab6a5e0bcc1d6
* | | | Merge "Add tag-handling for Go To Matching in XML documents"Tor Norbye2011-08-045-60/+382
|\ \ \ \
| * | | | Add tag-handling for Go To Matching in XML documentsTor Norbye2011-08-035-60/+382
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eclipse has a Go to Matching feature, bound to Ctrl-Shift-P. However, for XML documents it only works on the character level, so if the caret is inside a tag it does nothing, and if you place it on an angle bracket, it just jumps to the opposite angle bracket for the same tag. This changeset adds a new character pair matcher which works at the tag level, so if you for example place the caret anywhere in an end tag, it will highlight the first character of the opening tag, and if you jump it will jump to that opening tag. Similarly, if you place the caret next to the < or tag name of an opening tag, it will jump to the closing tag. Change-Id: Id25487b24616abf79c71de5eec21f8c0f07e68cc
* | | | | Merge "Improve smart-indent handling in XML files"Tor Norbye2011-08-046-2/+727
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | Improve smart-indent handling in XML filesTor Norbye2011-08-036-2/+727
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset adds a new "auto edit strategy" for Android XML files, which replaces the default XML auto-indenter (which just copied the indentation of the previous line.) The new indenter instead uses the lexical information to indent based on the tag and bracket balance. For example, if the | represents the caret position, then the following shows how the edits are transformed: <foo name="value"/>| => <foo name="value"/> | <foo name="value">| => <foo name="value"> | <foo <foo attr1 = "value1"|> => attr1 = "value1" |> <foo <foo attr1 = "value1"/>| => attr1 = "value1"/> | It can also modify the text after the caret, as in the following transformation: <foo>|</foo> => <foo> | </foo> See the unit test for more cases. Change-Id: Ia99ecf6573ff4a9473970aa2fd481d2228ddf45d
* | | Merge "Initial implementation of the new logcat panel."Siva Velusamy2011-08-049-0/+801
|\ \ \
| * | | Initial implementation of the new logcat panel.Siva Velusamy2011-08-049-0/+801
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | This logcat panel will show up in ddms if it is launched with -Dcom.android.ddms.useNewLogCatView. Currently, this implementation only displays a table with a list of logcat messages. It lacks features such as filters, go-to source of exception, export to log, user preferences, etc. Future patches should enhance the UI to achieve feature parity with older UI. Change-Id: I3dde3c590c839318ce57bb5f005627f580ebb06c
* | | Merge "Conditionally create old logcat view."Siva Velusamy2011-08-041-5/+24
|\ \ \
| * | | Conditionally create old logcat view.Siva Velusamy2011-08-041-5/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As a first step towards replacing the logcat view, wrap the code that creates and manages the current logcat view to first check which implementation to use. The old implementation is used unless a JVM property "com.android.ddms.useNewLogCatView" is set. Change-Id: Idbdfcc55f0f5f28f7004b010875b89de8a4cea12
* | | | Merge "Convert tabs to spaces"Siva Velusamy2011-08-041-6/+6
|\ \ \ \ | |/ / /
| * | | Convert tabs to spacesSiva Velusamy2011-08-041-6/+6
|/ / / | | | | | | | | | Change-Id: I7032663689943b22342b49736f0656df778cd456
* | | Merge "sdkman2: if nothing selected yet, select new/updates."Raphael Moll2011-08-033-92/+440
|\ \ \ | |/ / |/| |
| * | sdkman2: if nothing selected yet, select new/updates.Raphael Moll2011-08-033-92/+440
|/ / | | | | | | | | | | | | | | | | Also synchronize selection between the sort-by-api and the sort-by-source mode. Updated with unit tests. Change-Id: I714953dee219bc7a5471a347571262459f6052de
* | Merge "Use Windows line delimiters on Windows"Tor Norbye2011-08-033-21/+51
|\ \ | |/ |/|
| * Use Windows line delimiters on WindowsTor Norbye2011-08-023-21/+51
| | | | | | | | Change-Id: I33094888432214fc5c70c4c4392d8afd932a3a7a
* | Merge "Update tools/ADT to rev 14."Xavier Ducrohet2011-08-0317-27/+27
|\ \
| * | Update tools/ADT to rev 14.Xavier Ducrohet2011-08-0217-27/+27
| | | | | | | | | | | | Change-Id: Id29498fde61185a63812b7267b64560a8fd54dc5
* | | Merge "Fix magnetic field sensor string."David Turner2011-08-031-2/+2
|\ \ \ | |/ / |/| |
| * | Fix magnetic field sensor string.Adam Zalcman2011-07-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The emulator's sensor module sends "magnetic-field:<x>:<y>:<z>" rather than "magnetic:<x>:<y>:<z>", see external/qemu/android/hw-sensors.c. Change-Id: I858f4f88a4af47504bbf204340db238cf2ac2d66 Signed-off-by: Adam Zalcman <viathor@google.com>
* | | Merge "SDK Man2: Fix initial load of all sources."Raphael Moll2011-08-022-1/+19
|\ \ \
| * | | SDK Man2: Fix initial load of all sources.Raphael Moll2011-08-022-1/+19
| | | | | | | | | | | | | | | | Change-Id: I54598804adad6b21ba524829570d28135f0586ca
* | | | Merge "Add a new XML formatter, new options, and format on save"Tor Norbye2011-08-0219-47/+1862
|\ \ \ \ | | |_|/ | |/| |
| * | | Add a new XML formatter, new options, and format on saveTor Norbye2011-08-0119-47/+1862
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset adds a custom XML formatter for the Android XML editors. There is an option for turning off this formatter and using the standard XML formatter instead. The new custom formatter offers the following features: * By default, it formats files following the Android conventions for XML formatting. This means not only that it indents with 4 space characters (instead of the Eclipse default of one tab character), but it places attributes on a line of their own, it adds blank lines in certain places, and so on. * It sorts attributes (logically, alphabetically, or none) * It formats files with different styles depending on the context. For example, in layout files it always places a single blank line between view elements, whereas in manifest files it only places blank lines between elements of different types such that for example the <uses-permission> elements all form a logical group, separated from <uses-sdk> and so on. The fact that strings.xml and layout.xml are usually formatted with different flavors is one of the reasons setting up the old Eclipse XML formatter to do the right thing was not possible. In addition, there are various user options added to the Editors preference page where you can tweak the behavior of the formatter, such as turning off blank lines completely, controlling whether there is a space before the > or /> closing characters, and you can also tell the formatter to use Eclipse's indentation setting (indentation size and whether to use spaces or tabs). Finally, there is a new "Format on Save" option which behaves just like Format on Save for Java files: when you press Ctrl-S to save a file, the XML content will be formatted before the file is saved. Change-Id: Ic6f05c768ab063b09f6f0248f60fbe8722fb149d
* | | | Merge "Add clipart support to the asset set wizard"Tor Norbye2011-08-025-8/+232
|\ \ \ \ | |_|/ / |/| | |
| * | | Add clipart support to the asset set wizardTor Norbye2011-08-025-8/+232
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset adds clipart support to the asset set wizard. There is only one placeholder clipart image now but the code reads the available images from the jar dynamically. This changeset also adds "file exists - replace yes, no, always, never" handling for the generated icons. Change-Id: I38d0c40957eff4a9e844e29d61f2c57493bd10f0
* | | Merge "Fix ADT on Windows: don't use private FontData fields."Raphael Moll2011-08-021-1/+1
|\ \ \
| * | | Fix ADT on Windows: don't use private FontData fields.Raphael Moll2011-08-021-1/+1
|/ / / | | | | | | | | | | | | | | | | | | Most FontData fields must NOT be accessed directly as they are platform-dependent. Change-Id: I26ad9b40b9d2040931551c6f08fa033ef3c24386
* | | 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