aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix NON-NLS tokensTor Norbye2011-01-0428-144/+144
| | | | | | | | | | | | | There were a number of // $NON-NLS-1$ references in the codebase. Eclipse's "Externalize Strings" functionality will not handle these correctly; there must not be a space between the "//" and the "$NON" tokens. (I left AndroidXmlEditor.xml alone; it is the file I discovered the problem in but I fixed those references as part of another pending checkin.) Change-Id: If185c88a667273af614f0bee5959fd2618756c05
* Merge "New XML Wizard fixes"Tor Norbye2011-01-042-21/+68
|\
| * New XML Wizard fixesTor Norbye2011-01-012-21/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Make the LinearLayout default width and height values be match_parent for Android 2.x and up, fill_parent for older. This fixes issue 13481: ADT creates layout resources with fill_parent instead of match_parent 2. Give the Name field initial focus rather than the Project field, since you usually don't want to edit the Project field and more than once I've accidentally edited the project name instead. 3. Don't require the user to manually type ".xml" as a suffix since it's required anyway. If you type "foo", it will create "foo.xml". You can however type "foo.xml" (and you cannot type any other extensions.) Change-Id: Ibd03bb73e283b02991662de6ab889f647554b7d6
* | Merge "use UTF-8 instead of ISO-8859-1"Xavier Ducrohet2011-01-041-1/+1
|\ \
| * | use UTF-8 instead of ISO-8859-1Gasol Wu2010-12-031-1/+1
| | | | | | | | | | | | | | | | | | resolve issue #1590, logcat needs to support UTF-8. Change-Id: I226d8ab358a667cb3c37f76e81e5eda4f3f3b097
* | | Merge "Minor method rename in SdkManager UI."Raphael Moll2011-01-033-4/+7
|\ \ \
| * | | Minor method rename in SdkManager UI.Raphael Moll2011-01-033-4/+7
|/ / / | | | | | | | | | Change-Id: I35447fe1ae9a21763207a07c0e205c1808f3b420
* | | Merge "Move Pair<,> from ADT to SdkLib.utils"Raphael Moll2011-01-039-5/+11
|\ \ \
| * | | Move Pair<,> from ADT to SdkLib.utilsRaphael Moll2011-01-039-5/+11
|/ / / | | | | | | | | | Change-Id: I5c37e4b4dd83bc239ed242709ede70982f14705f
* | | Merge "SDK Manager in ADT: make it possible to unload the SDK."Raphael Moll2011-01-0310-78/+318
|\ \ \
| * | | SDK Manager in ADT: make it possible to unload the SDK.Raphael Moll2011-01-0310-78/+318
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One of the issues when using the SDK Manager from Eclipse is that, at least on Windows, we can't upgrade the platform-tools or the targets since they might be locked by ADT. Typically dex.jar is in use and typically we have various data/res (ttf and xml) files used by any opened layout editor. This adds the necessary infrastructure to know in ADT when packages are going to be installed. There's a crude attempt to solve the dex.jar issue. However unloading the targets isn't done yet. Change-Id: I5c48144501c7f39ef779bfeffdfae85a48c65a29
* | | Merge "SDK Manager: Rework install logic."Raphael Moll2011-01-0314-178/+408
|\ \ \
| * | | SDK Manager: Rework install logic.Raphael Moll2011-01-0314-178/+408
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should get rid of the annoying behavior on Windows that prevent the "folder swap" operation due to the folders being locked. Cf public issue 4410. High level summary of the issue and the fix: the old behavior was to unzip in a temp folder, then rename the old folder to another temp file and finally rename the new folder at the desired location. This fails typically when there is a file indexer (e.g. anti-virus) scanning the new folder so we can't move that folder. The new logic is to try to move the old folder first into a temp folder. If the fail move, we have a lock on the old folder and ask the user to fix it manually. They probably have a file opened and it's a legit issue to report. Once that succeeded we can directly unzip the archive into the final destination without using a temp unzip location, thus avoiding the common "indexer in progress" issue. In case the unzip operation fails, we try to copy (not move) the old folder back. Change-Id: I5ed67ff626532fe7cc48a45e87d1dbaf6954f28a
* | | Merge "SDK Manager: Split install logic out of the Archive class."Raphael Moll2011-01-033-737/+791
|\ \ \
| * | | SDK Manager: Split install logic out of the Archive class.Raphael Moll2011-01-033-737/+791
|/ / / | | | | | | | | | Change-Id: I669229ad6d8906ca654c9be5e3416360cc7a5fb5
* | | Merge "Fix android.bat to properly cd to temp dir."Raphael Moll2011-01-031-1/+1
|\ \ \
| * | | Fix android.bat to properly cd to temp dir.Raphael Moll2010-12-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes an issue when the SDK is not on the same drive than the temp dir that android.bat uses. Reported on http://code.google.com/p/android/issues/detail?id=4410 Change-Id: I993ea550056bda2c696c28bfa135aa186aad7a05
* | | | Merge "Replace hand-written mocking classes with EasyMock calls"Tor Norbye2011-01-0311-1978/+209
|\ \ \ \ | |_|_|/ |/| | |
| * | | Replace hand-written mocking classes with EasyMock callsTor Norbye2010-12-2911-1978/+209
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset removes the various hand-written mock implementations of key Eclipse interfaces (IProject, IFile, IFolder, etc) and replaces them with EasyMock proxy objects. This makes our codebase buildable on Eclipse 3.6+. (Also fix a couple of test warnings for abstract testcase classes which were missing tests) Change-Id: I70553ab95dc9386da1c7eed139d3ef587d929478
* | | Merge "Prevent adding children into AdapterViews"Tor Norbye2010-12-296-3/+196
|\ \ \
| * | | Prevent adding children into AdapterViewsTor Norbye2010-12-296-3/+196
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As reported in issue 13042, it's possible to add views into AdapterViews such as ListView. This causes a rendering error. The root issue is that we were relying on ElementDescriptor#hasChildren() to determine whether a particular view is willing to accept children, but that isn't entirely correct, since all subclasses of AdapterView (such as ListView, Spinner, etc) will throw an exception if you do that. To fix this, I've added a new method to DescriptorUtils, "canInsertChildren", which performs additional checking beyond hasChildren(). If it has an actual view object, it will walk up the super class chain and see if the view extends AdapterView, and if no view object is available, it will filter out the known subclasses of AdapterView (well, it doesn't have to filter out Spinner since that class doesn't report that it has children). Change-Id: I663b18fcfbe97a10c8f1aaa2d75552fb8fb148d5
* | | Merge "Fix error in include cycle detection"Tor Norbye2010-12-291-6/+8
|\ \ \
| * | | Fix error in include cycle detectionTor Norbye2010-12-291-6/+8
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | The code to detect cycles in include dependencies was wrong; it would incorrectly identify some valid DAGs as having a cycle. We don't necessarily have a cycle just because we encounter a node we've already seen; it is only a cycle if we encounter a vertex that we are currently visiting further back in the depth-search. Change-Id: I3149c80d54258e6fff4cb0a0b1a3cefcb1db56f2
* | | Merge "Fix NPE when deleting a layout resource file."Raphael Moll2010-12-282-7/+19
|\ \ \ | |/ / |/| |
| * | Fix NPE when deleting a layout resource file.Raphael Moll2010-12-282-7/+19
|/ / | | | | | | | | | | | | | | The IncludeFinder tries to read the file, but the workspace is not in sync so although the resource exists in the workspace there is no XML file to read anymore. Change-Id: If0ca5cca8e6978f1777531d6413d7c30a54c9d7d
* | Merge "Enable code specific to Eclipse 3.5"Raphael Moll2010-12-284-82/+7
|\ \
| * | Enable code specific to Eclipse 3.5Raphael Moll2010-12-274-82/+7
| | | | | | | | | | | | Change-Id: I29f6d1d74ce2979882988c18bc3e79d995445015
* | | Merge "Enable code specific to Eclipse 3.5"Raphael Moll2010-12-281-5/+1
|\ \ \ | |/ /
| * | Enable code specific to Eclipse 3.5Raphael Moll2010-12-271-5/+1
| | | | | | | | | | | | Change-Id: Ib750dab8839f919474fd6e92b9960f14d355e4ca
* | | Merge "Improve custom class loading failure handling"Tor Norbye2010-12-282-13/+60
|\ \ \ | |/ / |/| |
| * | Improve custom class loading failure handlingTor Norbye2010-12-232-13/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For background, see http://code.google.com/p/android/issues/detail?id=13389 We currently both load and instantiate custom view classes under the same try/catch block, and if there is a failure, the user is informed that the class could not be -found-. However, in many cases the real failure is in actually -instantiating- the class, so telling the user that the class could not be found is misleading and can make the user hunt down library dependencies, checking jar contents, etc. This changeset improves the situation in the following ways: - The code to load and instantiate are handled separately, and the list of missing classes is kept separate from the list of uninstantiatable classes. - The error display in the layout editor lists these two categories separately. - For instantiation errors, we dig up the root cause and log that one. The error display points to the Error Log for more details. - If the class looks like it might be a custom view class (rather than a loading or instantiation failure in one of the Android or Add-Ons classes) then the error message also includes a tip about using View.isInEditMode to try to do less work for design time rendering. Change-Id: I947ad91e0d7973e9c3aefed1824f61c92c5fb1ed
* | | Merge "Add readme regarding move of adb to platform-tools"Raphael Moll2010-12-242-0/+13
|\ \ \
| * | | Add readme regarding move of adb to platform-toolsRaphael Moll2010-12-232-0/+13
|/ / / | | | | | | | | | Change-Id: I861a1b02a3abb1bb1f9120bbd25f3d4ffd949e9e
* | | Merge "Switch Eclipse Plugin build to Eclipse 3.5.2 RCP"Raphael Moll2010-12-233-10/+13
|\ \ \ | |/ / |/| |
| * | Switch Eclipse Plugin build to Eclipse 3.5.2 RCPRaphael Moll2010-12-093-10/+13
| | | | | | | | | | | | Change-Id: Icc846dd9654aa80d3f80bf61daa7cf4d9f2d4ba1
* | | Merge "Add Up/Down Icons"Tor Norbye2010-12-221-4/+5
|\ \ \
| * | | Add Up/Down IconsTor Norbye2010-12-221-4/+5
|/ / / | | | | | | | | | | | | | | | Add Up/Down icons to the outline context menu for the Move Up and Move Down actions. Change-Id: I1d94871034946eb166968c76fbab61be5f1f23e5
* | | Merge "Update keybinding registration"Tor Norbye2010-12-221-18/+17
|\ \ \
| * | | Update keybinding registrationTor Norbye2010-12-211-18/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were using deprecated registration hooks for our 3 keybindings; this changeset updates to the currently supported way to do keybinding registration. Change-Id: If6f95f0075a7d6662d320f8001836b5c846e64be
* | | | Merge "Add Move Up/Down Actions"Tor Norbye2010-12-225-15/+327
|\ \ \ \ | |/ / / |/| | |
| * | | Add Move Up/Down ActionsTor Norbye2010-12-215-15/+327
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset adds "Move Up" and "Move Down" context menu items to the outline, as well as keyboard shortcuts for these: + and -. The actions apply only when the Outline window has focus. Thus, to reorder an item you can select it, then press + repeatedly to move it down in the hierarchy or - to move it back up. In addition, this changeset fixes a selection syncing issue which also affected drag & drop: It will now correctly always select the target dropped tree items after a drag or reorder. Change-Id: I11ce4fd302e537b86a614a7cbe59f1ac47f61aa5
* | | Merge "Rewrite Outline drag & drop handler"Tor Norbye2010-12-2114-383/+581
|\ \ \
| * | | Rewrite Outline drag & drop handlerTor Norbye2010-12-2114-383/+581
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewrite the drag source and drop target listeners for the Outline. The drop target listener now uses the SWT Tree support for drag & drop (such that you for example get drop position feedback lines between siblings). You can now drag items within the outline to do precise reordering, as well as target particular positions during drops, either within the outline or from the canvas or the palette. This changeset also fixes a number of other issues I ran into at the same time: - Fix keyboard shortcuts such that they map to the same context as the canvas (e.g. when you activate the outline it shows the same undo context as if you click in the associated canvas) - Fix a bug with context menu code when none of the options are selected in the XML - Fix selection dispatch. If you had two side by side canvases, selecting items in the Outline would show highlights in both canvases; it now only causes selection syncing with the associated canvas. Change-Id: I00c3c38fabf3711c826a3bc527356cbc77ad4a7e
* | | Merge "LayoutLib API refactoring"Xavier Ducrohet2010-12-2154-345/+638
|\ \ \
| * | | LayoutLib API refactoringXavier Ducrohet2010-12-2154-345/+638
|/ / / | | | | | | | | | Change-Id: I40abba4c4f786755c2a1c0e70df4d7bc08e2bcde
* | | Merge "Bugfix in Android JUnit run configuration page in Eclipse"Tor Norbye2010-12-201-4/+1
|\ \ \
| * | | Bugfix in Android JUnit run configuration page in EclipseThomas Westling2010-12-201-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bugfix for bug 12411: code.google.com/p/android/issues/detail?id=12411 When a user leaves the Android JUnit run configuration page, an icon is disposed. Upon returning to the page, the plugin tries to reuse the icon, which is disposed, causing an IllegalArgumentException. This bug is fixed by this commit. Change-Id: I260b6a5cd75192abc7aa051d6f141956a391c0e4
* | | | Merge "Edit AVDs in AVD Manager."Raphael Moll2010-12-204-22/+203
|\ \ \ \
| * | | | Edit AVDs in AVD Manager.Raphael Moll2010-12-194-22/+203
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SDK Bug: b.android.com/13276 Change-Id: I495cd8cb9e4287a7cb14a3797e5b9d3b3e07160b
* | | | | Merge "Make AvdCreationDialog compatible with WindowBuilder."Raphael Moll2010-12-201-0/+7
|\ \ \ \ \ | |/ / / /
generated by cgit v1.1 at 2025-01-19 18:46:06 +0000