aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Support package conflicts between app and libs."Xavier Ducrohet2012-12-053-32/+210
|\
| * Support package conflicts between app and libs.Xavier Ducrohet2012-12-053-32/+210
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If 2 libraries share the same package name, this is now a build breakage, unless all libraries share the same package. This is because the libraries R classes only contain the resources declared in the libraries themselves (plus dependencies). Since two libraries could share the same package name without depending on one another, it's possible to ensure that creating only one R class would work for both. (Merging both R class might be possible but is too risky for a quick fix like this). If all the libraries share the same package, then a single R class is created for that package that contains all the symbol of the app (simpler than merging all the symbols for now) If a library and the app share the same package name, the R class for the library is not created (since the R class for the app contains all resources). This already worked in ADT, so this changeset only fixes Ant. Change-Id: I95f0b734ba263051961268d960d59749f5b6e1a5
* | Merge "Make templates handle custom namespaces properly"Tor Norbye2012-12-053-1/+12
|\ \
| * | Make templates handle custom namespaces properlyTor Norbye2012-12-043-1/+12
| | | | | | | | | | | | Change-Id: Id3685aa63a1e3017b345ec28bbb454656547258c
* | | Merge "Fix Rename Application Package such that it doesn't touch bin/"Tor Norbye2012-12-057-21/+261
|\ \ \ | |/ / |/| |
| * | Fix Rename Application Package such that it doesn't touch bin/Tor Norbye2012-12-057-21/+261
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the rename application package refactoring such that it only modifies AndroidManifest.xml, not for example a copy in bin/. Also added a diagnostic information message to the plain Java package refactoring, shown when refactoring the application package, explaining that the refactoring will not actually change the manifest package, and explaining how to invoke the dedicated refactoring to change it. Also add unit tests for this refactoring. Change-Id: I13054e033b9ee44210ca341f00c633d73a4418b4
* | Merge "Fix handling of custom namespace attributes in lint"Tor Norbye2012-12-046-25/+113
|\ \ | |/ |/|
| * Fix handling of custom namespace attributes in lintTor Norbye2012-12-046-25/+113
|/ | | | | | | | | | | | First, don't complain about an unexpected namespace if the offending attribute is a layout parameter, since it applies to the parent, not the current view. Second, for the res-auto warning, report the error only on the xmlns namespace declaration, not each usage of that namespace. Change-Id: If6a7576cf56c0936a24be851cfc48bc54d374ea4
* Merge "Include Error Log view in ADT bundle"Siva Velusamy2012-12-042-0/+2
|\
| * Include Error Log view in ADT bundleSiva Velusamy2012-12-042-0/+2
| | | | | | | | Change-Id: Ia1cef2f50d725fbed5012b46f2a9440b6154df0b
* | Merge "Suggest using monitor only if it is available."Siva Velusamy2012-12-043-6/+12
|\ \
| * | Suggest using monitor only if it is available.Siva Velusamy2012-12-043-6/+12
| |/ | | | | | | | | | | | | | | This is so that users who run tools out of the Android source tree built for a particular device don't see the suggestion, since monitor is not yet built during device builds. Change-Id: I8d68a52f950f928a6a6a349bc5cf4c40b1d2e474
* | Merge "UI Automator Viewer improvements"Guang Zhu2012-12-044-4/+42
|\ \
| * | UI Automator Viewer improvementsGuang Zhu2012-11-274-4/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Non-root device needs to do dexopt into alternative dalvik cache when uiautomator is called for the very first time; This may incidentally lead to long response time from XML dump via UI Automator Viewer; The 40s timeout is long enough but it was actually not passed into IDevice#executeShellCommand() * Dumped XML has "rotation" attribute on root node since API Level 17, we now make use of this to rotate captured screenshot image * Fixed an Eclipse warning on unclosed InputStream Bug: 7564716 Bug: 7564146 Change-Id: Ie46968aff323ed392990febfd89e18f2dbd099de
* | | Merge "40876: Lint should flag "extension" pattern specifiers in ↵Tor Norbye2012-12-045-22/+109
|\ \ \ | |_|/ |/| | | | | SimpleDateFormat"
| * | 40876: Lint should flag "extension" pattern specifiers in SimpleDateFormatTor Norbye2012-12-035-22/+109
| | | | | | | | | | | | Change-Id: I427e498a314aeaeb2a302811bfde1dc719e435d5
* | | Merge "Add missing LOCAL_MODULE_TAGS to makefiles"Siva Velusamy2012-12-0310-0/+10
|\ \ \ | |/ / |/| |
| * | Add missing LOCAL_MODULE_TAGS to makefilesSiva Velusamy2012-12-0310-0/+10
|/ / | | | | | | Change-Id: Icbf4401f65e257c0bdcce3ccde6ef7cc6cb5d53b
* | Merge "Fix goto @+id, and order layout_width before width in completion"Tor Norbye2012-12-0316-34/+148
|\ \
| * | Fix goto @+id, and order layout_width before width in completionTor Norbye2012-11-2916-34/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset makes two XML editing releated tweaks: * First, Go To Declaration now works on @+id/ attributes. Until now, it ignored these with a comment that we're already at the declaration. However, there are cases where these are also used as a forward reference, such as in layout parameters for a relative layout. Now Go To Declaration will allow you to jump from these layout parameters to the actual element defining the attribute. * Second, if the user types "wi" in code completion, we offer both android:width and android:layout_width. However, the layout parameters were offered second, meaning users would sometimes select width instead of layout_width, the more likely choice. This changeset tweaks the order of the results in this scenario to offer the layout parameters first. Finally, it also makes some tweaks the the unit test framework to for example wait for all Android targets to be loaded (this wasn't always the case which made the test sometimes fail when running, but not when debugged.) It also updates the target SDK used for golden files to API 16 (from API 12) so some golden files are updated with changes in available attributes and descriptions. Change-Id: I84c92961f42fe63d39b6eeff9186d66183d67d6c
* | | Merge "Add override detector"Tor Norbye2012-12-039-2/+201
|\ \ \
| * | | Add override detectorTor Norbye2012-11-309-2/+201
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This lint detector finds method declarations which are likely to clash and accidentally override framework classes defined on newer platforms Also, fix method position computation in class files. Change-Id: If0d03feb55e44816f75938dae3164c53ed5b3183
* | | | Merge "API check: Only check calls and field accesses, not declarations"Tor Norbye2012-12-032-118/+64
|\ \ \ \ | |/ / /
| * | | API check: Only check calls and field accesses, not declarationsTor Norbye2012-11-302-118/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It appears Dalvik is very forgiving and doesn't try to preload classes until actually needed, so there is no need to flag variable and field declarations, and in fact, patterns used for supporting new and old versions sometimes declares these methods and only conditionally end up actually accessing methods and fields, so only check method and field accesses. Also fix lint such that it doesn't flag XML resource warnings for tools URI namespace elements, such as ListView preview layout selections. Change-Id: I9018a64845b5b29744926e3d0be371801bbdd167
* | | | Merge "Add tools:targetApi to control local minSdk (like @TargetApi)"Tor Norbye2012-12-0310-64/+216
|\ \ \ \ | |/ / /
| * | | Add tools:targetApi to control local minSdk (like @TargetApi)Tor Norbye2012-11-3010-64/+216
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add XML editor quickfix to set the attribute on an API violation. Change-Id: Ife95d73659656e98a6fb1a322354f5fcfcef1888
* | | | Merge "Fix rename type, rename package and move type refactorings"Tor Norbye2012-12-0321-2242/+1072
|\ \ \ \
| * | | | Fix rename type, rename package and move type refactoringsTor Norbye2012-12-0321-2242/+1072
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL updates the various refactorings to properly handle layout refactoring such that it not only updates custom views, but also updates fragment references, tool:context references etc. It also fixes missing manifest updates (such as replacing the parentActivityName attributes). Most importantly, it also fixes bugs where the wrong elements in the manifest could get updated. There are a lot of diffs in this CL because I basically replaced the old refactoring code (which had a lot of custom text change and document manipulation code) with code based on the new resource refactoring, where there is a single iteration of the XML documents. This also improves the emitted refactoring elements such that it only lists each file once. Also updated the unit tests to check additional scenarios; adding a second activity with the same prefix as the first is what revealed the broken document handling in the old code. Change-Id: I7c5959ca6b046ce3dab566663988cdd0389b0e5b
* | | | Merge "Close resource"Tor Norbye2012-12-031-1/+10
|\ \ \ \
| * | | | Close resourceTor Norbye2012-12-031-1/+10
| |/ / / | | | | | | | | | | | | Change-Id: I4683dc68a9f74ad8a2c709c8313c17ccbfbd64a1
* | | | Merge "Install host tools in debug mode."Ying Wang2012-11-307-4/+9
|\ \ \ \
| * | | | Install host tools in debug mode.Ying Wang2012-11-307-4/+9
| | | | | | | | | | | | | | | | | | | | Change-Id: I25cbf7fceffb521d63f766e37b1788f8a85e6fc4
* | | | | Merge "Add renderscript specific compilation target."Xavier Ducrohet2012-11-306-16/+40
|\ \ \ \ \
| * | | | | Add renderscript specific compilation target.Xavier Ducrohet2012-11-306-16/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The property name is "renderscript.target" and is to be located in project.properties. If not present, the minSdkVersion (or 11 if lower) is used. Change-Id: Ic243474ce1d5ce2235cbfdfc45092ed8a5ffbbf7
* | | | | | Merge "Fix typo in issue id"Tor Norbye2012-11-303-88/+88
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix typo in issue idTor Norbye2012-11-303-88/+88
|/ / / / / | | | | | | | | | | | | | | | Change-Id: I0e96e4b3d5d9c3fa14e4f84d73a6bd023f44162a
* | | | | Merge "Make inefficient weight detector identify more candidates"Tor Norbye2012-11-308-7/+114
|\ \ \ \ \
| * | | | | Make inefficient weight detector identify more candidatesTor Norbye2012-11-298-7/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The inefficient weight detector looks for horizontal layouts with weights where all the children are layouts. It didn't have a very good heuristic for finding out whether all children are layouts; it just looked for whether the tag name contains "Layout". This changeset generalizes this a bit, adding other layouts, as well as <fragment> tags to the lint check. It also updates the Master/Detail template to set the baseline alignment attribute to false (to avoid triggering the updated lint check), as well as android:textIsSelectable to clear another recent new lint rule. Change-Id: I887962b5e29a9ad0c5b5c01970b0c66f884125d8
* | | | | | Merge "Fix nullness annotation"Tor Norbye2012-11-301-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix nullness annotationTor Norbye2012-11-291-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | Change-Id: Ic9317e88e94dc13f1c11f49a5300349e28f3c747
* | | | | Merge "Add filterscript suppport."Xavier Ducrohet2012-11-309-39/+99
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | |
| * | | Add filterscript suppport.Xavier Ducrohet2012-11-299-39/+99
|/ / / | | | | | | | | | Change-Id: Iaefb640f35bdad1dc5d4be8565c2cafdc02e8324
* | | Merge "Fix Nexus 1 resolution."Xavier Ducrohet2012-11-291-1/+1
|\ \ \
| * | | Fix Nexus 1 resolution.Xavier Ducrohet2012-11-291-1/+1
| |/ / | | | | | | | | | Change-Id: Ib16fbe90cf73d924fc4947ff8a358fc0431d4abc
* | | Merge "Add support for layout dir qualifiers."Xavier Ducrohet2012-11-297-19/+288
|\ \ \ | |/ / |/| |
| * | Add support for layout dir qualifiers.Xavier Ducrohet2012-11-297-19/+288
| | | | | | | | | | | | Change-Id: I6da728d079975fa19f1ae816fa585031a9c6fe75
* | | Merge "Remove emulator modules from sdk PRODUCT_PACKAGES"Jesse Hall2012-11-291-15/+0
|\ \ \ | |/ / |/| |
| * | Remove emulator modules from sdk PRODUCT_PACKAGESJesse Hall2012-11-281-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | These are now added by build.git/target/product/sdk.mk; other products need to build the emulator too, so adding them here isn't appropriate. Bug: 7556265 Change-Id: I85b1ce8b565f23d0ed10979628760c3965f4cceb
* | | Merge "SDK: Relative AVD root path."Raphael Moll2012-11-293-10/+195
|\ \ \
| * | | SDK: Relative AVD root path.Raphael Moll2012-11-293-10/+195
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AVD have a root ini file in .android/avds/name.ini with a "path" absolute path to the avd config directory. This does 2 things: - force the file to use ISO-8859-1 (aka Latin1) encoding. - add a "path.rel" key with a relative path to the .android folder if the avd directory is at its typical location. The loading logic is: - try to use the "path" key if it points to an existing directory (as an absolute path). - otherwise use the "path.rel" key as a path relative to the .android folder if present. SDK Bug: 40498 Change-Id: I2364c2ee69f48816f3e6f6f33c9fa43170e05587
generated by cgit v1.1 at 2025-01-19 16:08:34 +0000