aboutsummaryrefslogtreecommitdiffstats
path: root/eclipse
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Handle attributes in the res-auto namespace in the layout editorTor Norbye2012-03-021-0/+11
| | | | | | | | | | | | Change-Id: I324d7ef6afdb016b457f020e254a75e0a6d71fb8
* | | Merge "Only generate the libraries R/manifest classes in the app project."Xavier Ducrohet2012-03-022-7/+6
|\ \ \ | | |/ | |/|
| * | Only generate the libraries R/manifest classes in the app project.Xavier Ducrohet2012-03-012-7/+6
| | | | | | | | | | | | | | | | | | | | | If the project is a library itself then there's no need to generate them. Change-Id: I9896e2bac81979797cca10fc606c66e5139fc9a1
* | | Merge "Show correct icons for <view class="Button"/>"Tor Norbye2012-03-021-1/+16
|\ \ \
| * | | Show correct icons for <view class="Button"/>Tor Norbye2012-03-011-1/+16
| | |/ | |/| | | | | | | Change-Id: I14b75cbbd80bdefc0a03f7b78579772ac0905b6e
* | | ADT: fix assert when opening manifest.Raphael2012-03-011-17/+18
|/ / | | | | | | | | | | | | | | | | | | | | In very rare instances, it seems like the xpath used to find the manifest root element isn't working properly and triggers the assert after it. It's unclear what can trigger this issue. This removes the XPath code and manually finds the root element. Change-Id: Idf983e12306aed3058916fe4a5e847830ecf8fe1
* | ADT: remove view.png and keep View.pngRaphael Moll2012-03-011-0/+0
|/ | | | Change-Id: If1d294fdb5b487df91368716052d336c8f5c0589
* Merge changes I9f8bbb10,I8fc53e0fXavier Ducrohet2012-03-013-29/+42
|\ | | | | | | | | | | * changes: Java project dependencies on libs are automatically added to main project. Move Android project with Java project dep test to its own folder.
| * Java project dependencies on libs are automatically added to main project.Xavier Ducrohet2012-03-013-29/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | Android Library projects can reference other Java-only project. This used to be added to the library jar output. This created an issue if two Library projects were referenced by the same app as the java project was added to both library jar files. This change makes it so that the java project output is not in the library jar files but is instead added to the container of the main app as a project classpath entry. Change-Id: I9f8bbb104e29aede5393afd5ea4b8fe882145d49
* | GridLayout fix: Ensure that the column count is adequateTor Norbye2012-03-011-1/+2
| | | | | | | | Change-Id: Ic1c82cae57d1ea41f54b49c3414ae526b2045ec7
* | Merge "gltrace: Add support for glVertexAttribPointerData() calls."Siva Velusamy2012-03-018-94/+213
|\ \
| * | gltrace: Add support for glVertexAttribPointerData() calls.Siva Velusamy2012-02-298-94/+213
| |/ | | | | | | | | | | | | | | This patch adds initial support for glVertexAttribPointerData() calls. A detail provider for this call displays the vertex attributes that were actually sent at the time of glVertexAttribPointer() call. Change-Id: I79fe961ce1dcc15c4601ec213d09625986775ae5
* | Update Layout Editor iconsTor Norbye2012-02-2968-11/+3
|/ | | | | | | | This changeset updates the palette icons to new ones contributed by Herculano Campos. In addition to the palette, it also updates the canvas zoom control buttons. Change-Id: I03ffb683a4e0e82f5656eadc3cf769aedfb918e8
* Merge "Switch Perspective before opening source files."Siva Velusamy2012-02-296-49/+95
|\
| * Switch Perspective before opening source files.Siva Velusamy2012-02-296-49/+95
| | | | | | | | | | | | | | | | Currently, source revealers just reveal a file in the current perspective. This changeset adds an option to first switch perspectives before revealing the source file. Change-Id: I5e89a89276f48ba41504434a1d2bb417f9ba541c
* | Make XML editors work with non-workspace filesTor Norbye2012-02-2827-51/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset makes the AndroidXmlEditor handle other editor inputs than just FileEditorInput. In particular, it now handles IURIEditorInput as well. This makes the "Go To Declaration" facility for @android resources work properly again, and unlike before, you can now use our editors in those files as well, so you can use Go To Declaration to jump to other @android resources within the same platform. This changeset adds checks after all the getInputFile() calls on the editor, which ensures that features which assume a file exists (such as the quickfix and visual refactoring operations) do not do anything in these files. The layout editor has a lot of file requirements, so that editor is deliberately skipped and you get a plain editor instead if you try to open layout files outside of the workspace. See http://code.google.com/p/android/issues/detail?id=26164 Change-Id: I7457494ec0bfc2eb4e6eba2e059025142c21d3ce
* | Merge "Fix configuration information for library projects"Xavier Ducrohet2012-02-282-8/+4
|\ \
| * | Fix configuration information for library projectsTor Norbye2012-02-282-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset fixes one more bug related to lint configurations and library projects (see issue 26029). Some lint checks, such as the MergeRootFrameLayoutDetector, computes the warnings at the end of processing all files. At that point, the context points to the master project, so any errors which were actually found in a library project will instead be using the master project's configuration. That means that any suppress rules applies to the lint.xml in the library project will be ignored. This changeset fixes this by moving the logic which looks up the severity for a warning out of the lint clients and into the context. Now it checks the current projects being scanned and looks up the corresponding project for each file (based on the file prefix), and retrieves the configuration that way. This changeset also makes one more fix: It now consults *both* the library project *and* the master project to see if a rule should be ignored. This means that if you turn off a given check in your master project, you will no longer see those warnings from library projects either, which seems desirable. Change-Id: Icb5cdf7696b4908b0553f86896793515cb06f29c
* | | Never add R/R$* classes to the library jar files.Xavier Ducrohet2012-02-281-5/+7
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous change added excluding Manifest and BuildConfig but made it so that it was only for the current app package. The problem is that project that depends on libraries also generates R classes for their libraries. If the project itself is a library then the R classes from the libraries would get in the library jar output. If the main project had some diamond dependencies in its libraries then the same R class from a library could be added twice to its dex input causing an error. Change-Id: I0ef4a3c3f84bf9099de27e275fa856b6c044978d
* | Merge "Ensure R/Manifest/BuildConfig classes are not added to the library ↵Xavier Ducrohet2012-02-271-7/+24
|\ \ | | | | | | | | | jar file."
| * | Ensure R/Manifest/BuildConfig classes are not added to the library jar file.Xavier Ducrohet2012-02-271-7/+24
| | | | | | | | | | | | | | | | | | | | | First, their are not needed there, second they can create a dx conflict if the library uses the same package as the app. Change-Id: I67b3f478d5d7ab79d02b6ece8b1eae31b8ed104e
* | | Merge "17467: Display update problem for Custom & Library View"Xavier Ducrohet2012-02-271-2/+4
|\ \ \
| * | | 17467: Display update problem for Custom & Library ViewTor Norbye2012-02-271-2/+4
| |/ / | | | | | | | | | Change-Id: Ic64930c80777d7ecdedfebcbac87a4fa919e6937
* | | Merge "26077: 'Select all' button selects only one attribute on 'Extract ↵Xavier Ducrohet2012-02-271-1/+9
|\ \ \ | | | | | | | | | | | | style' dialog"
| * | | 26077: 'Select all' button selects only one attribute on 'Extract style' dialogTor Norbye2012-02-271-1/+9
| |/ / | | | | | | | | | Change-Id: Ie77933fdb529fd5c8cfc960804196fed3ea3c659
* | | Merge "Fix 26029: Lint in r17 preview ignores per-project lint.xml"Xavier Ducrohet2012-02-271-1/+1
|\ \ \
| * | | Fix 26029: Lint in r17 preview ignores per-project lint.xmlTor Norbye2012-02-271-1/+1
| |/ / | | | | | | | | | Change-Id: Idc1d27a727a24230ae2fcc58dbd2f08673425100
* | | Merge "gltrace: Add support for VBO's"Siva Velusamy2012-02-279-2/+535
|\ \ \ | |/ / |/| |
| * | gltrace: Add support for VBO'sSiva Velusamy2012-02-279-2/+535
| |/ | | | | | | | | | | | | | | | | | | | | Add support for Vertex Buffer Object operations: - Add VBO state - Add transforms for VBO operations: glGenBuffers, glDeleteBuffers, glBufferData & glBufferSubData - Add details provider that can display the buffer data in a bunch of different formats. Change-Id: I30fe1b0924f180ba40fca04a8a4dd53357cc6a7e
* | Merge "Fix support for custom views in library on ADT's side."Xavier Ducrohet2012-02-242-2/+2
|\ \
| * | Fix support for custom views in library on ADT's side.Xavier Ducrohet2012-02-242-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Don't check for final field when parsing R.java (in libraries fields are not final anymore) and fix a bug in the new aaptparser which would return a failed to parse aapt error when the output is empty. Also add customview in library test app.
* | | Fix SuppressLint annotations in outer classesTor Norbye2012-02-241-4/+15
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset makes @SuppressLint work for classfile based detectors when the error is found in an inner class and the SuppressLint annotations is on an outer class. Innerclasses are actually separate classes from their outer classes, so they are processed separately (each .class file is read and analyzed independently). This changeset processes the class files in alphabetical* order such that it can maintain a stack of outerclasses when processing a class. The suppress lint check can then visit the outer class' annotations to see if the error should be suppressed. (*: The order isn't exactly alphabetical: We want Foo$Bar.class to come after Foo.class) This changeset also tweaks the Add Annotation quickfix such that it only offers per-method or per-class annotations, since class files do not maintain annotation info for other granularities (such as on variable declarations, so you cannot suppress classfile based issues with annotations there.) We could make a lint check which ensures that you don't try to put these annotations there :-) (This is related to issue http://b.android.com/25948) Change-Id: Ia9dbc39b1adc73a1b60e375edbf9b5618c7d2353
* | Fix a possible NPE when opening projects in Eclipse.Xavier Ducrohet2012-02-241-1/+6
| | | | | | | | Change-Id: I9e4b35a370f9f3bf7b2868b4a267907bfa8d4cd4
* | Lint bug fixesTor Norbye2012-02-241-3/+2
|/ | | | | | | | | | | | | | | | | This changeset fixes a couple of Lint bugs: (1) Handle BOMs (byte order marks) in Java files. We already handle this for XML files (where it's common) but these can be present in other file types as well, such as Java. See http://code.google.com/p/android/issues/detail?id=25952 (2) Fix a bug (false positive) in the FloatMath detector; the visitor approach can get confused; do simple ASM node iteration instead (which is how all the other detectors work; this detector was written before we had the ASM DOM model) Change-Id: I65b4e6cd8d8e6c7e591433d8eb5aedf273e2caad
* am bcc8185e: Merge "Disabling action buttons in device panel. Before ↵Jean-Baptiste Queru2012-02-231-0/+3
|\ | | | | | | | | | | | | selecting a target device." * commit 'bcc8185eb311085b10c05c8e767c6abec5fb8eaf': Disabling action buttons in device panel. Before selecting a target device.
| * Merge "Disabling action buttons in device panel. Before selecting a target ↵Jean-Baptiste Queru2012-02-231-0/+3
| |\ | | | | | | | | | device."
| | * Disabling action buttons in device panel.Keiji Ariyama2012-02-191-0/+3
| | | | | | | | | | | | | | | | | | Before selecting a target device. Change-Id: I704d8af3d5f89dcbc5eb8e5e6b6090ddd8561e22
* | | Merge "Handle nulls from Element.getAttribute (fix for issue 25668)"Tor Norbye2012-02-231-12/+11
|\ \ \
| * | | Handle nulls from Element.getAttribute (fix for issue 25668)Tor Norbye2012-02-231-12/+11
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Element.getAttribute isn't supposed to return null, but in Eclipse it sometimes does. It was common in 3.5.2, which we've dropped support for, but issue 25668 shows that it can happen in Eclipse 3.7.1 too though it's rare. This changeset attempts to address the issue in two ways: (1) Spotfix the specific NPE (2) Hold the readlock on the XML document while the detectors are using the DOM nodes (this is in case the nulls are related to this, which is not certain given that the issue is rare and not reproducible) Change-Id: I14727531ea9e08abf45d70013248e702cf5a15eb
* | | Fix issue 25862Tor Norbye2012-02-233-22/+38
|/ / | | | | | | | | | | | | | | This changeset fixes issue 25862 and also makes a couple of other tweaks such as avoiding the location getting cleared when you edit the project name in a particular scenario. Change-Id: I2ca0b4224a2c626fd0b525a34e9de527227c87ac
* | Merge "Always use dynamic IDs for unknown project resources."Xavier Ducrohet2012-02-222-40/+86
|\ \
| * | Always use dynamic IDs for unknown project resources.Xavier Ducrohet2012-02-222-40/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the past we've only used dynamic IDs for missing resources of type ResourceType.ID because they can be created by layout files that are not saved. However if auto-refresh and auto-build are both disabled, there can be operations that create resources that won't be present in R.java yet but are still needed for rendering. So we need to create dynamic IDs for them too. This commit reuse the new DynamicIdMap from the layoutlib since we needed one that included resource type instead of just resource name. The dynamic map is reset every time the resources are compiled and we get a new set of ID from aapt. Change-Id: I059c93f63f32a2e389783d21c66c7d8c7d818a2d
* | | Merge "Make sure to remove obsolete id from the res repo after a delete."Xavier Ducrohet2012-02-221-0/+13
|\ \ \ | |/ /
| * | Make sure to remove obsolete id from the res repo after a delete.Xavier Ducrohet2012-02-221-0/+13
| | | | | | | | | | | | Change-Id: I5a42a436dd9d21a632af175a860a85aa1d3b5a1d
* | | gltrace: Add support for generic vertex attributes.Siva Velusamy2012-02-223-5/+181
| | | | | | | | | | | | Change-Id: I6eec29a0f48291324178d9e419cc10013274e0ff
* | | Merge "ADT: Suggest solution to ADT version check error."Raphael2012-02-229-98/+336
|\ \ \
| * | | ADT: Suggest solution to ADT version check error.Raphael2012-02-229-98/+336
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This amends the ADT version check to help the user either: - open the SDK Manager - open the P2 Updater - open the Android Preference On Windows the launch the *external* SDK Manager since eventually we know that ADT will lock something that would prevent the update from working in the first place. Change-Id: Ib20e4e1411b36e3cd794cccbc02518db0a40ced9
* | | Merge "Split ProGuard file into two halves"Tor Norbye2012-02-225-15/+103
|\ \ \ | |/ / |/| |
| * | Split ProGuard file into two halvesTor Norbye2012-02-215-15/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset splits the proguard.cfg into two halves: (1) All the general Android settings go into $ANDROID_SDK/proguard/proguard-android.txt. This defines shrinking rules like keep custom views, etc. The crucial point is that this information is maintained and updated by Tools updates, so whenever new APIs are added to Android, or whenever bugs are found in the configuration such as flags needed to work with Dalvik, we can make the updates - we don't have old snapshots living on in projects. (2) Any project specific settings go to proguard-project.txt in the project. (3) The proguard.config property in project.properties now refers to a *path* of configuration files, which are all passed to ProGuard in the given order. The code which processes this setting will substitute android.sdk.home and user.home variables, so the path does not have to be hardcoded to point to the project-android.txt file. The default project templates have been updated to include a commented out configuration setting up proguard as described above. The default proguard file name was changed from proguard.cfg to proguard-project.txt such that it can be directly opened in Eclipse and to make it clear it's an editable text file. Lint was updated to find the Proguard file via the proguard.config property as well as via the old and new default names for projects not enabled with ProGuard. A subsequent CL will add a lint check which identifies projects containing the old setup (full local configuration) and offer to replace it with the new setup. Change-Id: I44b4c97a160114c2382f02f843c95486a0dc9d6b
* | | Merge "ddms: Add Network Stats View"Siva Velusamy2012-02-225-0/+59
|\ \ \