aboutsummaryrefslogtreecommitdiffstats
path: root/eclipse
Commit message (Collapse)AuthorAgeFilesLines
* Preview support in the templatesTor Norbye2012-06-1816-349/+756
| | | | | | | | | | | | | | | | | | | | | | | | This changeset adds a Preview page to the end of the template wizards which shows the changes to be applied to the project - first the files which were edited (merged), such as the manifest file in the case of a new activity, and second the text files to be created, and third the binary files to be created. In addition, the user can now uncheck any of these changes, if for example the manifest file edit isn't wanted. Furthermore, the now that the changes are computed up front, the phase of applying the changes is run in the background with a progress bar in the New-wizard. There's also some consolidation of the various template wizards to handle things like the upgrade-page and the dependency-page in one place. Infrastructure wise this changes the template instantiation from being based on File manipulation to using the refactoring infrastructure's change support, which should be more reliable. It also fixes a bug where projects were marked as library projects which should not have be. Change-Id: I496761f01c7ec28bf9170e4d1041211e3ebe285b
* Project wizard tweaksTor Norbye2012-06-159-242/+108
| | | | | | | | | | | | Get rid of the ApplicationSkeleton page, and move the Create Custom Icon checkbox up to the front page. Also add a new "Mark as library project" checkbox there, which allows to create a new library project. Move the icon page up such that it appears before the activity template pages. Fix a bug in minSdk handling. And get rid of the "Android Blank Project" wizard since it's now redundant with the Android Application Project. Change-Id: I54ea0bb740ad8078008a832799378694f37bf9e0
* Merge "Misc. Minor bufixes"Siva Velusamy2012-06-152-3/+3
|\
| * Misc. Minor bufixesSiva Velusamy2012-06-152-3/+3
| | | | | | | | | | | | | | | | - Split Tooltip with newlines. On Linux, this showed up as a single long line. - Check for display !disposed before accessing it. Change-Id: I9790cd2f3bc43dbd5d0b5bae4a84b2f0b92076b1
* | Merge "Misc bugfixes"Tor Norbye2012-06-1512-49/+97
|\ \
| * | Misc bugfixesTor Norbye2012-06-1412-49/+97
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset fixes a number of unrelated minor issues: - Fix to the config composite such that changing the activity associated with the layout is sticky - Fix to the icon generator such that you can't select shape=none for notification icons - For the brief activity labels in the config composite, strip the outer class names for inner classes, e.g. from SessionLivestreamActivity$SessionLiveCaptionsFragment to SessionLiveCaptionsFragment. Also strip out "Activity" or "Fragment" from the suffix of the name if the name is long. - When creating a blank project and you're *not* creating an activity, don't create a dummy layout either. - Fix metadata for fragment and include such that you can convert one into the other using the Change Widget refactoring. - Fix bug where pulling up a hovering a lint tooltip, and then switching to the Java editor with the keyboard would leave the tooltip on the screen. - Only show lint tooltips and overlay icons if lint-on-save is enabled - Workaround Eclipse 4.x issue where switching between maximized layout editors would cause the structure view to be hidden Change-Id: I68aee8967e5fe5deb0f30c071f4c395966aa6304
* | Merge "Dependency support for the templates"Tor Norbye2012-06-1510-26/+510
|\ \
| * | Dependency support for the templatesTor Norbye2012-06-1410-26/+510
| | | | | | | | | | | | Change-Id: Id6b0e5f65fc3a50b352423623332c47f7ab5085d
* | | Merge "Add format handling to the template wizards"Tor Norbye2012-06-155-29/+87
|\ \ \ | |/ /
| * | Add format handling to the template wizardsTor Norbye2012-06-145-29/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset adds a format attribute to the templates. When the ADT plugin reads a template file, and the format version is a higher number than one it knows about, it rejects the templates and informs the user to upgrade the plugin. This allows us to change the format of the templates incompatibly in the future without worrying about users with older versions of the plugin running into problems (because they upgraded the tools but not ADT). It also adds a revision number to each template which is used for the opposite purpose: we can tell if a template is a slightly older revision and then do some conditional handling. Change-Id: If6c49012a1beca44c3a05b3e880ffde70294a57e
* | | Merge "Update templates"Tor Norbye2012-06-154-4/+4
|\ \ \ | |/ / | | / | |/ |/|
| * Update templatesTor Norbye2012-06-144-4/+4
| | | | | | | | | | | | | | | | | | | | This changeset updates the activity templates with new versions from Roman. Also fixes a couple of bugs he ran into: the camel case to underscore conversion methods were reversed, and the template test wizard didn't reset the activity template once the second page was shown. Change-Id: I353af646f92f37bf2a9827d0dc68a409dd9358bc
* | gltrace: cleanup collect trace flowSiva Velusamy2012-06-143-27/+132
|/ | | | | | | | | | | | | | | | This CL improves the initial flow to obtain the trace options from the user and launch the application in trace mode. - A separate text box is provided if a non-default activity should be launched for tracing. - If that application to trace is already running, it needs to be killed before starting it in trace mode. The tracer will now wait (upto a timeout value) until it detects that the application was killed before launching it in trace mode. - Similarly, the tracer waits until it knows that the app has launched before attempting to connect to it. - Checks if device is at API level 16. Change-Id: Iea5be6d76b6e78ea68a05b893aef993099363555
* Merge "ADT/Windows: figure the intial SDK Path from the registry."Raphael Moll2012-06-131-25/+114
|\
| * ADT/Windows: figure the intial SDK Path from the registry.Raphael Moll2012-06-131-25/+114
| | | | | | | | | | | | | | | | | | | | | | On Windows, the installer sets the SDK path in the registry. This adds code to the ADT initialization to use that. The init process is, in that order: - use the ADT prefs path, - use the ddms.cfg "last sdk path", - use the windows registry key. Change-Id: Ib749a8e08e7d0d91402ba25ee765a37f889fb921
* | Merge "Provide readable device name rather than just serial number"Siva Velusamy2012-06-133-13/+5
|\ \
| * | Provide readable device name rather than just serial numberSiva Velusamy2012-06-133-13/+5
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are a number of places where we need to display a device name. Currently, DDMS shows the serial number + manufacturer/model if available, but in other instances, we just show the serial number. This CL provides a getName() method in the IDevice interface so that all the locations which require a human readable name can use this. The name is typically of the form manufacturer-model-serial. If the manufacturer/model strings are not available, then those fields are omitted, so it will show just the serial number. Change-Id: I80ef7b48a4c7c8587042c1227c932251e18dba2e
* | Merge "28860: Default proguard.config invalid on Windows"Tor Norbye2012-06-133-7/+68
|\ \ | |/ |/|
| * 28860: Default proguard.config invalid on WindowsTor Norbye2012-06-133-7/+68
| | | | | | | | | | | | | | | | Attempt to work with ambiguous ProGuard path definitions (e.g. where : is used both as a path separator and in paths like D:\foo\bar) Change-Id: I63c3488b59ebfeb44e92ab84ec302932947ab909
* | GridLayout bug fixTor Norbye2012-06-121-2/+13
|/ | | | | | Handle baseline alignment better Change-Id: I331ebd2617612479eb686a456bd6f862f5acd7ea
* Migrate Fragment and ListView metadata to the tools namespaceTor Norbye2012-06-1210-201/+262
| | | | | | | | | | | | | | | | | | | | The persistent metadata storing AdapterView and Fragment bindings predates the new tools namespace handled by aapt, and uses XML comments. This changeset updates the code to using tools: attributes instead. Note that it doesn't migrate old settings; I could not find a way to do that performantly (and in some cases the code which reads a setting has no access to the document containing the metadata, only to parsed XML nodes, so it cannot mutate it on demand to the new format.) However, this shouldn't be a big deal; for fragments for example the fragment message states what needs to be done to set up a binding. This CL also fixes a couple of bugs around setting up these views which should make switching views faster (it used to do the work twice), and avoids a rare concurrent modification exception. Change-Id: Id6a8a9a1649c1b9f6f5fc6a9fbc3a6e5b0512dd6
* Merge "GridLayout support work"Tor Norbye2012-06-1213-311/+1830
|\
| * GridLayout support workTor Norbye2012-06-1213-311/+1830
| | | | | | | | | | | | | | | | | | | | | | Lots of miscellaneous fixes to the GridLayout support in ADT. The changes include using the GridLayout state (via reflection) to populate the model; caching the grid model for performance, and a bunch of fixes to the code which handles insertions and removals. There are also some new unit tests. This is not done, but is an improvement over the current state. Change-Id: I4851153d3e409630c2d2024c4894d1ad1535fb47
* | Merge "Fix bug in theme menu: don't strip style prefix from manifest"Tor Norbye2012-06-122-1/+4
|\ \ | |/ |/|
| * Fix bug in theme menu: don't strip style prefix from manifestTor Norbye2012-06-112-1/+4
| | | | | | | | Change-Id: I32c1f47b7e6e7c1d91d7e3000075046d2c872ad9
* | Merge "Minor UI cleanup to trace options dialog"Siva Velusamy2012-06-121-9/+39
|\ \ | |/ |/|
| * Minor UI cleanup to trace options dialogSiva Velusamy2012-06-121-9/+39
| | | | | | | | | | | | | | | | - Fix default message shown for activity - Make trace file path text editable - Save/Restore last used device Change-Id: I762a054e16c8ac5418375a5ac2086add7f631e45
* | Add Activity WizardTor Norbye2012-06-119-66/+229
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "Android Application" wizard has an embedded "activity chooser" page, and based on your selection the next page shows the configuration page for that activity. This changeset removes the two top level wizards for creating activities ("New Blank Activity" and "New Master/Detail"), with a single "New Activity" wizard whose first page is the activity chooser, and second page is the same as it was under the two individual wizards. Other than making the menu simpler this also has the advantage that it will pull in additional activities we register in the activities folder (updated separately from ADT). Change-Id: Iceef00178c4a0ceecc112db39f350285b7a223f7
* | Add an Import Existing wizardTor Norbye2012-06-119-76/+875
| | | | | | | | | | | | | | | | | | | | This changeset adds a new wizard, hooked up from the Import wizard as well as from the New Project wizard menu, which lets you import one or more Android projects (not necessarily Eclipse Android projects). It also removes the "From Existing Source" toggle from the Blank Project wizard. Change-Id: Ie5cb5b034be61a02b7d6496a7188f481f677a5a8
* | Merge "Add isSame on IDragElement, and sort primary to front"Tor Norbye2012-06-087-14/+106
|\ \
| * | Add isSame on IDragElement, and sort primary to frontTor Norbye2012-06-077-14/+106
| |/ | | | | | | Change-Id: I7121b5f0e3714fec705387603f641bc14ed0ab3e
* | Merge "Prevent zoom flicker"Tor Norbye2012-06-082-6/+22
|\ \
| * | Prevent zoom flickerTor Norbye2012-06-082-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The layout editor preserves the zoom level of a file when you close and reopen it later. However, when a layout is opened for the first time, there is a brief flicker as the layout is first shown at zoom level 100%, and then briefly thereafter rezoomed to fit the available canvas space. The reason for this is that when the editor is first created, the size of the layout editor is not known (SWT reports it as 0,0), so it can't compute a correct zoom level. The earlier solution was to do a Display.asyncExec() to rezoom soon. This changeset improves upon this by observing that we don't need the zoom to be recomputed until the canvas image is actually painted, so the delayed zoom is queried lazily both by the paint routine as well as the delayed setup runnable. This makes new layouts come up without any zoom flicker. Change-Id: I72a3a30fe40f26255951de50dcb8dcaeff44cbf7
* | | Missing from previous commitTor Norbye2012-06-081-1/+6
| | | | | | | | | | | | Change-Id: Ib9e8b906c651b2a59ed10e159a8f8027e2845059
* | | Run lint in the layout editor after undo/redoTor Norbye2012-06-083-5/+278
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lint already runs automatically after each edit in the layout editor. However, the undo and redo actions in the layout editor are mapped directly through to the XML editor's undo/redo actions (and when run their edits trigger a model refresh). This meant that after an undo or redo, lint would not run to update. If you for example delete a button that has a lint error on it, then undo that edit, the button comes back without the lint error. This CL fixes this: it now wraps the Undo/Redo actions with an action wrapper which first runs the delegated action, and then runs the edit hooks (e.g. lint) afterwards. Change-Id: I66431fd7989e1f3c0776563d159ca7b89fef8431
* | Merge "Fix layout window coordinator for Eclipse 4.2"Tor Norbye2012-06-082-14/+96
|\ \
| * | Fix layout window coordinator for Eclipse 4.2Tor Norbye2012-06-082-14/+96
| |/ | | | | | | | | | | | | | | | | | | | | | | | | Eclipse 4.x does not fire change events when the main editor window is maximized or un-maximized: https://bugs.eclipse.org/bugs/show_bug.cgi?id=382120 This CL works around that by using the layout editor's controlResized listener to query the state flags of the IEditorPart and update the maximized state as necessary. This fixes ADT issue http://code.google.com/p/android/issues/detail?id=32866 Change-Id: Icb13e7191b12959c7a7038c6bc6099666985fec5
* | Find Dialog: allow control over the default action.Siva Velusamy2012-06-081-1/+3
|/ | | | | | | | | | This CL allows the default action to be either of the "Find Next" or the "Find Previous" buttons in the find dialog. Typically, in logcat you want to find previous, while in gltrace view you want to find next. Change-Id: Ie11cbd8a7987b8011ec2ee3664034e9ecfc4e24b
* Merge "gltrace: Add support for mipmap textures"Siva Velusamy2012-06-076-20/+80
|\
| * gltrace: Add support for mipmap texturesSiva Velusamy2012-06-066-20/+80
| | | | | | | | Change-Id: I39782b06d6ebbfdde55cc76ed3c09424fef3dcda
* | Fix ADT build: update ManifestMerger constructors.Raphael Moll2012-06-072-3/+9
| | | | | | | | Change-Id: Ibd7a91a584644e71a8c40a812e3971d9dbe75cfa
* | Merge "Fix new project wizard's package validation"Tor Norbye2012-06-071-5/+22
|\ \
| * | Fix new project wizard's package validationTor Norbye2012-06-061-5/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The wizard suggests "com.example." as a package prefix. However, the validation would catch this as an invalid package and would just say "Enter a package name". If you were editing "com.example.foo" this was misleading. You now get a more specific warning when you've entered a package name that has the example package as a prefix. This CL also tweaks the focus handler which selects the prefix on focus-entry to not include the separating dot in the prefix. Change-Id: I659bb03515057eb5c760c51366869f4e0983f58a
* | | Merge "Improve location accuracy of stack trace to source mapping."Siva Velusamy2012-06-071-11/+45
|\ \ \ | |/ / |/| |
| * | Improve location accuracy of stack trace to source mapping.Siva Velusamy2012-06-071-11/+45
| |/ | | | | | | | | | | | | | | | | If the file name & line number is available from the stack trace, preference should be given to that as it provides accuracy to the exact line. If multiple results are obtained for the file name, then that list can be narrowed down using a method name search. Change-Id: If71bc23d4c1127f2e0150396741369409e5a8f08
* | Merge "Changes for ADT 20"Tor Norbye2012-06-061-1/+111
|\ \ | |/ |/|
| * Changes for ADT 20Tor Norbye2012-06-061-1/+111
| | | | | | | | Change-Id: I1fa969f017176e44d82b604617301544a11affef
* | Merge "Update MoreUnit prefs for new plugin names."Tor Norbye2012-06-062-3/+2
|\ \
| * | Update MoreUnit prefs for new plugin names.Tor Norbye2012-06-062-3/+2
| | | | | | | | | | | | | | | | | | Also fix a potential SWT exception. Change-Id: I45758b0ccad0daf4fe3b309cf93b9cd99bb54904
* | | Merge "Workaround for Eclipse 4.x focus issue"Tor Norbye2012-06-063-0/+83
|\ \ \ | |_|/ |/| |