aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix issue when a project and its libraries use the same jar files.Xavier Ducrohet2012-02-2491-4/+2253
| | | | | | | | | | | | | | | | | | | | | | | | | | This is only an issue in Ant because in Eclipse we don't automatically pull the jar files from libraries into the main project (we should somehow now that we have the Library Projects jar container that is dynamic). Right now we do a simple size/sha1 check on libraries that have the same name to figure out if they are the same version. If they are we only use one in the dex step (that notoriously fails to add the same class twice). If they are different we stop the build as it's an error (having two library projects depending on two different versions of a jar file should be an error as we can be sure the two versions are API compatible). For later: not use the file name only? find a way to version the libraries and to have them declare whether they are API compatible with older versions? Also added a hard-coded case for the Android Support Library. If both the v4 and the v13 are detected, use the v13 only as it includes the v4 already. New test apps. Three cases: - main and library projects with duplicate jar files that are identical - main and library projects with duplicate jar files that are NOT identical - main and library projects with v4 and v13 in the dependency list. Change-Id: I3a9abdcbec635d7c9d3228bdd105120f77178b27
* Merge "Fix typo"Xavier Ducrohet2012-02-232-9/+9
|\
| * Fix typoTor Norbye2012-02-232-9/+9
| | | | | | | | Change-Id: I16fadfbf801bcb60e0d7edda6af163bf158a4c21
* | am bcf3d2fb: am bcc8185e: Merge "Disabling action buttons in device panel. ↵Jean-Baptiste Queru2012-02-231-0/+3
|\ \ | | | | | | | | | | | | | | | | | | Before selecting a target device." * commit 'bcf3d2fbb58f832ef0fae628fc8175d2e91e8fd1': Disabling action buttons in device panel. Before selecting a target device.
| * \ 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 "Fork javac on windows to prevent file locking."Xavier Ducrohet2012-02-231-1/+13
|\ \ \ \ \
| * | | | | Fork javac on windows to prevent file locking.Xavier Ducrohet2012-02-231-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows, when using java 1.5/1.6 running javac without fork=true can result in file locking preventing further changes to them. This changes sets fork=true in this case (win, java 1.5/1.6). More info: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6558476 Bug: 24577 Change-Id: I6477ab0615c5a535b2011f2e9f40bc8f818f67a2
* | | | | | am 1bc6e780: am d7d4e986: Merge "Add --rename-manifest-package option to ↵Jean-Baptiste Queru2012-02-231-0/+22
|\ \ \ \ \ \ | | |/ / / / | |/| | | / | |_|_|_|/ |/| | | | | | | | | | | | | | aapt Ant task." * commit '1bc6e780661c67c9464c907c8eba74ae929ca0d8': Add --rename-manifest-package option to aapt Ant task.
| * | | | am d7d4e986: Merge "Add --rename-manifest-package option to aapt Ant task."Jean-Baptiste Queru2012-02-231-0/+22
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit 'd7d4e9866d44219b67142db30f68186ac0b1abc0': Add --rename-manifest-package option to aapt Ant task.
| | * | | Merge "Add --rename-manifest-package option to aapt Ant task."Jean-Baptiste Queru2012-02-231-0/+22
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Add --rename-manifest-package option to aapt Ant task.Christopher Orr2012-02-141-0/+22
| | | | |
* | | | | Merge "Lint API check should use main project's SDK version"Tor Norbye2012-02-233-4/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Lint API check should use main project's SDK versionTor Norbye2012-02-233-4/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the Lint API check is analyzing code in a library project, it should use the min sdk version from the main project (unless you are linting just a library project without including a main project). Change-Id: I6d09f2d3e406213014df55832e781813c96aedfd
* | | | Merge "Handle nulls from Element.getAttribute (fix for issue 25668)"Tor Norbye2012-02-232-12/+15
|\ \ \ \
| * | | | Handle nulls from Element.getAttribute (fix for issue 25668)Tor Norbye2012-02-232-12/+15
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-222-2/+15
|\ \ \ \ | |/ / /
| * | | Make sure to remove obsolete id from the res repo after a delete.Xavier Ducrohet2012-02-222-2/+15
| | | | | | | | | | | | | | | | Change-Id: I5a42a436dd9d21a632af175a860a85aa1d3b5a1d
* | | | Merge "Wrong category metadata for the color detector"Tor Norbye2012-02-221-1/+1
|\ \ \ \
| * | | | Wrong category metadata for the color detectorTor Norbye2012-02-221-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Id62e675e467a4c9754515640194c836ab4cb9a83
* | | | | Merge "SDK Repository: add "beta release candidate" tag to XSD"Raphael2012-02-222-5/+62
|\ \ \ \ \
| * | | | | SDK Repository: add "beta release candidate" tag to XSDRaphael2012-02-222-5/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds an optional integer>0 as "beta release candiate" to repository packages. This will be used in tools 18 to allow us to push beta versions of packages and still know how to update them compared to non-beta packages. Change-Id: I2f0d3cb75171bc23bce1eb511a4e3b86ca97245b
* | | | | | gltrace: Add support for generic vertex attributes.Siva Velusamy2012-02-223-5/+181
|/ / / / / | | | | | | | | | | | | | | | Change-Id: I6eec29a0f48291324178d9e419cc10013274e0ff
* | | | | Merge "Don't copy the whole SdkController into the SDK."Xavier Ducrohet2012-02-221-1/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Don't copy the whole SdkController into the SDK.Xavier Ducrohet2012-02-221-1/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | We don't want the multi-touch part in there yet. Change-Id: I4b7d214dd42b124cac592981cf71aedd408966ec
* | | | Merge "Add lint check for "old" proguard configurations with generic Android ↵Tor Norbye2012-02-229-15/+254
|\ \ \ \ | | | | | | | | | | | | | | | config"
| * | | | Add lint check for "old" proguard configurations with generic Android configTor Norbye2012-02-229-15/+254
| | | | | | | | | | | | | | | | | | | | Change-Id: I79cbdf874cffe78eb62f9af2e22e6cc780853e6a
* | | | | Merge "ADT: Suggest solution to ADT version check error."Raphael2012-02-2214-105/+380
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | ADT: Suggest solution to ADT version check error.Raphael2012-02-2214-105/+380
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2218-51/+269
|\ \ \ \ | |/ / / |/| | |
| * | | Split ProGuard file into two halvesTor Norbye2012-02-2118-51/+269
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
|\ \ \ \
| * | | | ddms: Add Network Stats ViewSiva Velusamy2012-02-215-0/+59
| | | | | | | | | | | | | | | | | | | | Change-Id: I89bf6b84a2ef2ed9a876eec41fae9a974ba93137
* | | | | Merge "gltrace: Add a GLCall detail provider."Siva Velusamy2012-02-2212-29/+181
|\ \ \ \ \ | |/ / / /
| * | | | gltrace: Add a GLCall detail provider.Siva Velusamy2012-02-2112-29/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following changes are performed in this CL: - The details view is moved into the views.detail package. - The details view supports detail providers for GL State Variables. This patch adds a new interface for providers that contribute details for GL Calls. This interface is used to provide support for displaying the framebuffer that might be part of a glDraw call. Change-Id: I2e327f02c6326759c23c2952acd361ff48f8f904
* | | | | Add lint rule to catch incorrect setColor callsTor Norbye2012-02-2110-17/+199
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android has various setColor methods (such as setTextColor) which take an integer, where it expects RGB values in the bytes. Since this is an integer, and since color resources are integers, sometimes code incorrectly passes the color resource id rather than a resolved color to the setter: paint.setColor(R.color.red) Obviously, the color should be "resolved" first via getResource().getColor(). This changeset adds a lint detector which catches these kinds of bugs. Change-Id: I2970e5220d24ad3b844a9f19fbe99b932d9f7fb4
* | | | | Merge "Suppress support and location tracking for translation detector"Tor Norbye2012-02-216-82/+224
|\ \ \ \ \
| * | | | | Suppress support and location tracking for translation detectorTor Norbye2012-02-216-82/+224
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset adds support for suppressing lint errors on translations. For a missing translation, place the suppress attribute on the default language key. For strings defined in other languages but not the default locale, place the attribute on the extra translation. This required adding better location tracking (which is also beneficial in that the translation warnings will show up as editor underlines in Eclipse etc). Instead of having errors generated for each locale ("the following strings are missing from locale X") it now generates a unique error for each string, listing which locales it's missing from. This also solves a different issue where the list of missing strings was truncated when large; there's no more truncation now. Change-Id: If63e92a6a750a5314af2f11441347cf9fc0b0a15
* | | | | Merge "Make API detector in XML files consider folder version"Tor Norbye2012-02-214-20/+55
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Make API detector in XML files consider folder versionTor Norbye2012-02-214-20/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Take the folder version into account when checking the API level in XML files. For example, even if minSdkVersion=5, it's okay to have a <GridLayout> element in a layout if that layout is in a layout-v14 (or higher) folder. Change-Id: Idbd3647c1145e4b3d03f90626339ef7e6b10c827
* | | | | Merge "gltrace: Show per frame summary statistics."Siva Velusamy2012-02-216-138/+419
|\ \ \ \ \
| * | | | | gltrace: Show per frame summary statistics.Siva Velusamy2012-02-216-138/+419
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL changes the framebuffer view to be a frame summary view. The Frame Summary View displays summary information regarding the currently displayed frame. For each frame, it displays: - the contents of the framebuffer at the end of the frame. - summary statistics regarding the GL Calls present in the frame. Change-Id: I293f5b0de40aac315dee257fbc3eaa3d5ff0919c
* | | | | | Merge "gltrace: Fix state update race condition."Siva Velusamy2012-02-211-30/+34
|\ \ \ \ \ \ | |/ / / / /
| * | | | | gltrace: Fix state update race condition.Siva Velusamy2012-02-211-30/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GL State is updated in reaction to user selections, and should be performed only in a synchronized block. Change-Id: Ieeaba4fd5a088b5b9e85a21fb6738c214d6f8c01
* | | | | | Merge "Lint rule to catch edit-usage of TextViews (should be EditText)"Tor Norbye2012-02-219-6/+485
|\ \ \ \ \ \
| * | | | | | Lint rule to catch edit-usage of TextViews (should be EditText)Tor Norbye2012-02-219-6/+485
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TextView provides a number of attributes related to text editing. However, these are generally intended for the EditText subclass of EditText. This lint check looks for <TextView> elements in layouts where one or more of the edit-related attributes (such as inputType) are defined. It also updates the deprecation detector to check various deprecated attributes (it only checked for deprecated elements before this.) Change-Id: I1b94902d906cd0bee6a6564368125a68b3c9bb2a
generated by cgit v1.1 at 2025-02-05 10:15:12 +0000